qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

系统默认水印

This commit is contained in:
Harryxzy 2023-06-16 09:58:54 +08:00
parent b544c5e2c1
commit f4b3a742f0
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/engine/salary/service/impl/SalaryBillBaseSetServiceImpl.java
View File

@ -73,6 +73,7 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB
wmSetting = JsonUtil.toJsonString(saveParam.getWmSetting());
}else{
// 系统默认水印 给一个默认的json
wmSetting = "{\"wmWidth\":100,\"wmRotate\":30,\"wmSelectedFieldIds\":[\"HRM_Name\"],\"pureWmText\":\" 当前操作者姓名 \",\"wmText\":\"<p><span style=\\\"font-size:16px;\\\">&nbsp;<span>$HRM_Name</span>&nbsp;</span></p>\",\"wmClassify\":\"text\",\"wmHeight\":100,\"wmOriginText\":\"<p><span style=\\\"font-size:16px;\\\">&nbsp;<span contenteditable=\\\"false\\\" data-id=\\\"HRM_Name\\\">当前操作者姓名</span>&nbsp;</span></p>\",\"wmNoTransparent\":15}";
}
watermark = saveParam.getWatermark().getValue();
} else {

3
src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
View File

@ -621,8 +621,9 @@ public class SalaryBillServiceImpl extends Service implements SalaryBillService
* @param salaryTemplate
*/
private void grantSendInfo(List<Long> ids, SalarySendPO salarySend, SalaryTemplatePO salaryTemplate, SalaryBillSendDTO salaryBillSendDTO) {
String waterMarkJson = salaryBillSendDTO.getWatermarkSetting() == null ? "" : JsonUtil.toJsonString(salaryBillSendDTO.getWatermarkSetting());
// 水印设置
salaryTemplate.setSalaryWatermark(JsonUtil.toJsonString(salaryBillSendDTO.getWatermarkSetting()));
salaryTemplate.setSalaryWatermark(waterMarkJson);
List<List<Long>> partition = Lists.partition(ids, 500);
Date sendTime = new Date();

6
src/com/engine/salary/service/impl/SalarySendServiceImpl.java
View File

@ -574,7 +574,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
salaryTemplate.setTheme(getBillTitle(salaryTemplate.getTheme(), salaryMonth, currentEmployeeId));
// 工资单水印文本型动态变量 == 处理
handleSalaryWatermark(salaryTemplate, salarySendInfo);
handleSalaryWatermark(salaryTemplate, salarySendInfo, currentEmployeeId);
map.put("salaryTemplate", salaryTemplate);
map.put("salaryAcctResult", salaryAcctResultS);
@ -588,7 +588,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
* @param salaryTemplate
* @param salarySendInfo
*/
private void handleSalaryWatermark(SalaryTemplatePO salaryTemplate, SalarySendInfoPO salarySendInfo) {
private void handleSalaryWatermark(SalaryTemplatePO salaryTemplate, SalarySendInfoPO salarySendInfo, Long currentEmployeeId) {
SalaryBillWatermarkDTO salaryBillWatermark = JsonUtil.parseObject(salaryTemplate.getSalaryWatermark(), SalaryBillWatermarkDTO.class);
if (Objects.isNull(salaryBillWatermark) || !salaryBillWatermark.getWatermarkStatus() ) {
return;
@ -602,7 +602,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
boolean needQueryEmp = (boolean) salaryBillWatermark.getWmSetting().getOrDefault("needQueryEmp", false);
DataCollectionEmployee simpleEmployee = null;
if (needQueryEmp) {
simpleEmployee = getSalaryEmployeeService(user).getEmployeeById(salarySendInfo.getEmployeeId());
simpleEmployee = getSalaryEmployeeService(user).getEmployeeById(currentEmployeeId);
}
String wmText = salaryBillWatermark.getWmSetting().getOrDefault("wmText", StringUtils.EMPTY).toString();