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

薪酬系统-多语言配置，适配部分中文字符，并合并master处理冲突

This commit is contained in:
sy 2023-05-06 17:28:00 +08:00
parent eb7014663e
commit fae2833aa5
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resource/国际化sql/20230506172355.zip Normal file
View File

Binary file not shown.

2
src/com/engine/salary/biz/SIArchivesBiz.java
View File

@ -128,7 +128,7 @@ public class SIArchivesBiz {
*/
public Map<String, Object> getBaseForm(WelfareTypeEnum welfareType, Long employeeId, Long operateId, User user, Long paymentOrganization) {
Map<String, Object> data = new HashMap<>(16);
SalaryAssert.notNull(employeeId, "员工id不可为空");
SalaryAssert.notNull(employeeId, SalaryI18nUtil.getI18nLabel(542864,"员工id不可为空"));
List<DataCollectionEmployee> employeeByIds = getSalaryEmployeeService(user).getEmployeeByIdsAll(Collections.singletonList(employeeId));
SalaryAssert.notEmpty(employeeByIds, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542131,"员工信息不存在"));
DataCollectionEmployee item = employeeByIds.get(0);

2
src/com/engine/salary/entity/datacollection/AddUpSituation.java
View File

@ -129,7 +129,7 @@ public class AddUpSituation {
/**
* 累计婴幼儿照护
*/
@SalaryFormulaVar(defaultLabel = "累计个人养老金", labelId = 117732, dataType = "number")
@SalaryFormulaVar(defaultLabel = "累计个人养老金", labelId = 542863, dataType = "number")
@Encrypt
private String addUpPrivatePension;

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

@ -297,7 +297,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
SalaryI18nUtil.getI18nLabel(542238, "累计减免税额"),
SalaryI18nUtil.getI18nLabel(542239, "累计已预扣预缴税额"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),537990,"累计婴幼儿照护"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),537990,"累计个人养老金"));
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542863,"累计个人养老金"));
//排序配置
OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
@ -384,7 +384,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
SalaryI18nUtil.getI18nLabel(542238, "累计减免税额"),
SalaryI18nUtil.getI18nLabel(542239, "累计已预扣预缴税额"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),537990,"累计婴幼儿照护"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),537990,"累计个人养老金"));
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542863,"累计个人养老金"));
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM");
//查询详细信息
@ -501,8 +501,8 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
SalaryI18nUtil.getI18nLabel(542237, "累计准予扣除的捐赠额"),
SalaryI18nUtil.getI18nLabel(542238, "累计减免税额"),
SalaryI18nUtil.getI18nLabel(542239, "累计已预扣预缴税额"),
SalaryI18nUtil.getI18nLabel(user.getLanguage(),537990,"累计婴幼儿照护")
SalaryI18nUtil.getI18nLabel(86702, "累计个人养老金")
SalaryI18nUtil.getI18nLabel(user.getLanguage(),537990,"累计婴幼儿照护"),
SalaryI18nUtil.getI18nLabel(542863, "累计个人养老金")
};
// 2.表头
List<Object> headerList = Arrays.asList(header);