diff --git a/resource/国际化sql/20230506172355.zip b/resource/国际化sql/20230506172355.zip new file mode 100644 index 000000000..61aae85d1 Binary files /dev/null and b/resource/国际化sql/20230506172355.zip differ diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 61a59b0f2..f4e8d9805 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -128,7 +128,7 @@ public class SIArchivesBiz { */ public Map getBaseForm(WelfareTypeEnum welfareType, Long employeeId, Long operateId, User user, Long paymentOrganization) { Map data = new HashMap<>(16); - SalaryAssert.notNull(employeeId, "员工id不可为空"); + SalaryAssert.notNull(employeeId, SalaryI18nUtil.getI18nLabel(542864,"员工id不可为空")); List employeeByIds = getSalaryEmployeeService(user).getEmployeeByIdsAll(Collections.singletonList(employeeId)); SalaryAssert.notEmpty(employeeByIds, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542131,"员工信息不存在")); DataCollectionEmployee item = employeeByIds.get(0); diff --git a/src/com/engine/salary/entity/datacollection/AddUpSituation.java b/src/com/engine/salary/entity/datacollection/AddUpSituation.java index f22bdc2bf..ad05424c5 100644 --- a/src/com/engine/salary/entity/datacollection/AddUpSituation.java +++ b/src/com/engine/salary/entity/datacollection/AddUpSituation.java @@ -129,7 +129,7 @@ public class AddUpSituation { /** * 累计婴幼儿照护 */ - @SalaryFormulaVar(defaultLabel = "累计个人养老金", labelId = 117732, dataType = "number") + @SalaryFormulaVar(defaultLabel = "累计个人养老金", labelId = 542863, dataType = "number") @Encrypt private String addUpPrivatePension; diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java index a96e9e78e..7ed113bf8 100644 --- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java @@ -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 headerList = Arrays.asList(header);