From fae2833aa5828b7ba8482651fbd199b9f1bb26ec Mon Sep 17 00:00:00 2001 From: sy Date: Sat, 6 May 2023 17:28:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=80=82=E9=85=8D?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=B8=AD=E6=96=87=E5=AD=97=E7=AC=A6=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E5=90=88=E5=B9=B6master=E5=A4=84=E7=90=86=E5=86=B2?= =?UTF-8?q?=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/国际化sql/20230506172355.zip | Bin 0 -> 9417 bytes src/com/engine/salary/biz/SIArchivesBiz.java | 2 +- .../entity/datacollection/AddUpSituation.java | 2 +- .../service/impl/AddUpSituationServiceImpl.java | 8 ++++---- 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 resource/国际化sql/20230506172355.zip diff --git a/resource/国际化sql/20230506172355.zip b/resource/国际化sql/20230506172355.zip new file mode 100644 index 0000000000000000000000000000000000000000..61aae85d1a6130e2fccc6249d12e4d341ed671b9 GIT binary patch literal 9417 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 E0HDk literal 0 HcmV?d00001 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);