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

薪酬系统，将部分新增代码中labelId入参统一置为0，方便后期多语言逻辑适配时定位

This commit is contained in:
sy 2024-02-04 15:10:35 +08:00
parent 306af48291
commit 6efbd9deb0
12 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,10 +445,10 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction
if (CollectionUtils.isNotEmpty(saveList)) {
LoggerContext loggerContext = new LoggerContext();
loggerContext.setUser(user);
loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除"));
loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除"));
loggerContext.setOperateType(OperateTypeEnum.ADD.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除"));
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除"));
loggerContext.setNewValueList(saveList);
SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext);
}

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

@ -876,10 +876,10 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
if (CollectionUtils.isNotEmpty(saveList)) {
LoggerContext loggerContext = new LoggerContext();
loggerContext.setUser(user);
loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除"));
loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除"));
loggerContext.setOperateType(OperateTypeEnum.ADD.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(100351, "新增累计专项附加扣除"));
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新增累计专项附加扣除"));
loggerContext.setNewValueList(saveList);
SalaryElogConfig.addUpSituationLoggerTemplate.write(loggerContext);
}

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

@ -424,10 +424,10 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction
if (CollectionUtils.isNotEmpty(saveList)) {
LoggerContext loggerContext = new LoggerContext();
loggerContext.setUser(user);
loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel( 100351, "新增累计专项附加扣除"));
loggerContext.setTargetName(SalaryI18nUtil.getI18nLabel( 0, "新增累计专项附加扣除"));
loggerContext.setOperateType(OperateTypeEnum.ADD.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 100351, "新增计专项附加扣除"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 100351, "新增累计专项附加扣除"));
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel( 0, "新增计专项附加扣除"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel( 0, "新增累计专项附加扣除"));
loggerContext.setNewValueList(saveList);
SalaryElogConfig.addUpDeductionLoggerTemplate.write(loggerContext);
}

8
src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
View File

@ -421,8 +421,8 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
loggerContext.setTargetId("" + salaryAcctRecordPO.getId());
loggerContext.setTargetName(targetName);
loggerContext.setOperateType(OperateTypeEnum.ADD.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98837, "添加薪资核算人员"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98837, "添加薪资核算人员") + ":" + targetName);
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "添加薪资核算人员"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "添加薪资核算人员") + ":" + targetName);
loggerContext.setNewValueList(salaryAcctEmployeePOS);
SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext);
}
@ -488,8 +488,8 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
loggerContext.setTargetId("" + salaryAcctRecordPO.getId());
loggerContext.setTargetName(targetName);
loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98835, "删除薪资核算人员"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98835, "删除薪资核算人员") + ":" + targetName);
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除薪资核算人员"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除薪资核算人员") + ":" + targetName);
loggerContext.setOldValueList(salaryAcctEmployeePOS);
SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext);
}

4
src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
View File

@ -255,8 +255,8 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
loggerContext.setTargetId("" + salaryAcctRecordPO.getId());
loggerContext.setTargetName(targetName);
loggerContext.setOperateType(OperateTypeEnum.ADD.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98837, "导出环比增加人员"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98837, "导出环比增加人员") + ":" + targetName);
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "导出环比增加人员"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "导出环比增加人员") + ":" + targetName);
SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext);
return ExcelUtilPlus.genWorkbookV2(rows, sheetName);

16
src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
View File

@ -304,8 +304,8 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
loggerContext.setTargetId("" + salaryAcctRecordPO.getId());
loggerContext.setTargetName(targetName);
loggerContext.setOperateType(OperateTypeEnum.ADD.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98768, "新建薪资核算"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98768, "新建薪资核算") + ": " + targetName);
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新建薪资核算"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新建薪资核算") + ": " + targetName);
loggerContext.setNewValues(salaryAcctRecordPO);
SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext);
// 返回薪资核算记录id
@ -538,8 +538,8 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
loggerContext.setTargetId("" + salaryAcctRecordPO.getId());
loggerContext.setTargetName(targetName);
loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98821, "删除薪资核算"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98821, "删除薪资核算") + ":" + targetName);
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除薪资核算"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除薪资核算") + ":" + targetName);
loggerContext.setNewValues(salaryAcctRecordPO);
SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext);
});
@ -580,8 +580,8 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
loggerContext.setTargetId("" + salaryAcctRecordPO.getId());
loggerContext.setTargetName(targetName);
loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98817, "薪资核算归档"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98817, "薪资核算归档") + ": " + targetName);
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "薪资核算归档"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "薪资核算归档") + ": " + targetName);
loggerContext.setNewValues(salaryAcctRecordPO);
SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext);
}
@ -630,8 +630,8 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
loggerContext.setTargetId("" + salaryAcctRecordPO.getId());
loggerContext.setTargetName(targetName);
loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98820, "重新核算"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98820, "重新核算") + ": " + targetName);
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "重新核算"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "重新核算") + ": " + targetName);
loggerContext.setNewValues(salaryAcctRecordPO);
SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext);
}

8
src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
View File

@ -661,8 +661,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
loggerContext.setTargetId(String.valueOf(salaryAcctEmployeePO.getSalaryAcctRecordId()));
loggerContext.setTargetName(targetName);
loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(95783, "编辑薪资核算结果") + ": " + operateDesc);
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(95783, "编辑薪资核算结果") + ": " + operateDesc);
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑薪资核算结果") + ": " + operateDesc);
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑薪资核算结果") + ": " + operateDesc);
loggerContext.setNewValueList(Lists.newArrayList(salaryAcctResultPOS));
SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext);
}
@ -866,8 +866,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
loggerContext.setTargetId(String.valueOf(calculateParam.getSalaryAcctRecordId()));
loggerContext.setTargetName(targetName);
loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(95783, "薪资核算"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(95783, "薪资核算"));
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "薪资核算"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "薪资核算"));
SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext);
} catch (Exception e) {
log.info("薪资核算出错：{}", e.getMessage(), e);

12
src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
View File

@ -210,8 +210,8 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService
loggerContext.setTargetId(String.valueOf(salaryItemPO.getId()));
loggerContext.setTargetName(salaryItemPO.getName());
loggerContext.setOperateType(OperateTypeEnum.ADD.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98329, "新建薪资项目"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98329, "新建薪资项目") + ": " + salaryItemPO.getName());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新建薪资项目"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新建薪资项目") + ": " + salaryItemPO.getName());
loggerContext.setNewValues(salaryItemPO);
SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext);
}
@ -293,8 +293,8 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService
loggerContext.setTargetId(String.valueOf(newSalaryItemPO.getId()));
loggerContext.setTargetName(newSalaryItemPO.getName());
loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(93892, "编辑薪资项目"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(93892, "编辑薪资项目") + ": " + newSalaryItemPO.getName());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑薪资项目"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑薪资项目") + ": " + newSalaryItemPO.getName());
loggerContext.setOldValues(salaryItemPO);
loggerContext.setNewValues(newSalaryItemPO);
SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext);
@ -358,8 +358,8 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService
loggerContext.setTargetId(String.valueOf(salaryItemPO.getId()));
loggerContext.setTargetName(salaryItemPO.getName());
loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98323, "删除薪资项目"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98323, "删除薪资项目") + ": " + salaryItemPO.getName());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除薪资项目"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除薪资项目") + ": " + salaryItemPO.getName());
loggerContext.setOldValues(salaryItemPO);
SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext);
});

8
src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java
View File

@ -136,8 +136,8 @@ public class SalarySobCheckRuleServiceImpl extends Service implements SalarySobC
loggerContext.setTargetId("" + salarySobPO.getId());
loggerContext.setTargetName(salarySobPO.getName());
loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(93870, "编辑校验规则"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(93870, "编辑校验规则") + ": " + newSalarySobCheckRulePO.getName());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑校验规则"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑校验规则") + ": " + newSalarySobCheckRulePO.getName());
loggerContext.setOldValues(salarySobCheckRulePO);
loggerContext.setNewValues(newSalarySobCheckRulePO);
SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext);
@ -185,8 +185,8 @@ public class SalarySobCheckRuleServiceImpl extends Service implements SalarySobC
loggerContext.setTargetId("" + salarySobPO.getId());
loggerContext.setTargetName(salarySobPO.getName());
loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98646, "删除校验规则"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98646, "删除校验规则") + ": " + salarySobCheckRulePO.getName());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除校验规则"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除校验规则") + ": " + salarySobCheckRulePO.getName());
loggerContext.setOldValues(salarySobCheckRulePO);
SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext);
});

4
src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
View File

@ -270,8 +270,8 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
loggerContext.setTargetId("" + salarySob.getId());
loggerContext.setTargetName(salarySob.getName());
loggerContext.setOperateType(OperateTypeEnum.UPDATE.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(98613, "编辑薪资账套薪资项目"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(98613, "编辑薪资账套薪资项目"));
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "编辑薪资账套薪资项目"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "编辑薪资账套薪资项目"));
SalaryElogConfig.salarySobLoggerTemplate.write(loggerContext);
}

4
src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
View File

@ -186,7 +186,7 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange
}
//记录日志
String operateTypeName = Objects.equals(saveParam.getIncludeType(), 1) ?
SalaryI18nUtil.getI18nLabel(98601, "关联人员范围新增对象") : SalaryI18nUtil.getI18nLabel(98602, "从范围中排除新增对象");
SalaryI18nUtil.getI18nLabel(0, "关联人员范围新增对象") : SalaryI18nUtil.getI18nLabel(0, "从范围中排除新增对象");
LoggerContext<SalarySobRangeSaveParam> loggerContext = new LoggerContext<>();
loggerContext.setUser(user);
loggerContext.setTargetId("" + salarySobPO.getId());
@ -215,7 +215,7 @@ public class SalarySobRangeServiceImpl extends Service implements SalarySobRange
Integer includeType = salarySobRangePOS.get(0).getIncludeType();
//记录日志
String operateTypeName = Objects.equals(includeType, 1) ?
SalaryI18nUtil.getI18nLabel(98605, "关联人员范围删除对象") : SalaryI18nUtil.getI18nLabel(98606, "从范围中排除删除对象");
SalaryI18nUtil.getI18nLabel(0, "关联人员范围删除对象") : SalaryI18nUtil.getI18nLabel(0, "从范围中排除删除对象");
salarySobPOS.forEach(salarySobPO -> {
LoggerContext<SalarySobPO> loggerContext = new LoggerContext<>();
loggerContext.setUser(user);

4
src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java
View File

@ -98,8 +98,8 @@ public class SysSalaryItemServiceImpl extends Service implements SysSalaryItemSe
loggerContext.setTargetId(String.valueOf(sysSalaryItemPO.getId()));
loggerContext.setTargetName(sysSalaryItemPO.getName());
loggerContext.setOperateType(OperateTypeEnum.ADD.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(93891, "添加系统薪资项目"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(93891, "添加系统薪资项目") + ": " + sysSalaryItemPO.getName());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "添加系统薪资项目"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "添加系统薪资项目") + ": " + sysSalaryItemPO.getName());
loggerContext.setNewValues(sysSalaryItemPO);
SalaryElogConfig.salaryItemLoggerTemplate.write(loggerContext);
});