diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 98b45758d..e7a4012f8 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -1171,30 +1171,30 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { list.stream().forEach(item -> { if (Objects.equals(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), item.getWelfareType())) { if (Objects.equals(DataTypeEnum.SYSTEM.getValue(), item.getDataType())) { - baseResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(542283, "申报基数"), item.getId() + "socialBase"); + baseResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542283, "申报基数"), item.getId() + "socialBase"); } - result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(500201, "个人"), item.getId() + "socialPer"); - commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(544197, "正常缴纳个人"), item.getId() + "socialCommonPer"); - repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(544198, "补缴个人"), item.getId() + "socialRepairPer"); - balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(544199, "补差个人"), item.getId() + "socialBalancePer"); + result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(user.getLanguage(),500201, "个人"), item.getId() + "socialPer"); + commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(user.getLanguage(),544197, "正常缴纳个人"), item.getId() + "socialCommonPer"); + repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(user.getLanguage(),544198, "补缴个人"), item.getId() + "socialRepairPer"); + balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(user.getLanguage(),544199, "补差个人"), item.getId() + "socialBalancePer"); } if (Objects.equals(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), item.getWelfareType())) { if (Objects.equals(DataTypeEnum.SYSTEM.getValue(), item.getDataType())) { - baseResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(542283, "申报基数"), item.getId() + "fundBase"); + baseResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542283, "申报基数"), item.getId() + "fundBase"); } - result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(500201, "个人"), item.getId() + "fundPer"); - commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(544197, "正常缴纳个人"), item.getId() + "fundCommonPer"); - repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(544198, "补缴个人"), item.getId() + "fundRepairPer"); - balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(544199, "补差个人"), item.getId() + "fundBalancePer"); + result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(user.getLanguage(),500201, "个人"), item.getId() + "fundPer"); + commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(user.getLanguage(),544197, "正常缴纳个人"), item.getId() + "fundCommonPer"); + repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(user.getLanguage(),544198, "补缴个人"), item.getId() + "fundRepairPer"); + balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(user.getLanguage(),544199, "补差个人"), item.getId() + "fundBalancePer"); } if (Objects.equals(WelfareTypeEnum.OTHER.getValue(), item.getWelfareType())) { if (Objects.equals(DataTypeEnum.SYSTEM.getValue(), item.getDataType())) { - baseResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(542283, "申报基数"), item.getId() + "otherBase"); + baseResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542283, "申报基数"), item.getId() + "otherBase"); } - result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(500201, "个人"), item.getId() + "otherPer"); - commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(544197, "正常缴纳个人"), item.getId() + "otherCommonPer"); - repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(544198, "补缴个人"), item.getId() + "otherRepairPer"); - balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(544199, "补差个人"), item.getId() + "otherBalancePer"); + result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(user.getLanguage(),500201, "个人"), item.getId() + "otherPer"); + commonResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(user.getLanguage(),544197, "正常缴纳个人"), item.getId() + "otherCommonPer"); + repairResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(user.getLanguage(),544198, "补缴个人"), item.getId() + "otherRepairPer"); + balanceResult.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(user.getLanguage(),544199, "补差个人"), item.getId() + "otherBalancePer"); } }); diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 532d59e03..b56c2a1d3 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -1185,7 +1185,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (employeeId == null) { return null; } - Long paymentOrg = paymentNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人")).get(SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人"))); + Long paymentOrg = paymentNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(user.getLanguage(),537996, "个税扣缴义务人")).get(SalaryI18nUtil.getI18nLabel(user.getLanguage(),537996, "个税扣缴义务人"))); List oldSocialSchemeInfos = getSocialSchemeMapper().getSocialByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO .builder() .employeeId(employeeId) @@ -1195,8 +1195,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { InsuranceArchivesSocialSchemePO insuranceArchivesSocialSchemePO = new InsuranceArchivesSocialSchemePO(); //设置社保账号、起始缴纳月、最后缴纳月 - String socialAccount = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91324, "社保账号")).get(SalaryI18nUtil.getI18nLabel(91324, "社保账号")); - Long socialSchemeId = schemeNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91323, "社保方案名称")).get(SalaryI18nUtil.getI18nLabel(91323, "社保方案名称"))); + String socialAccount = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(user.getLanguage(),81594, "社保账号")).get(SalaryI18nUtil.getI18nLabel(user.getLanguage(),81594, "社保账号")); + Long socialSchemeId = schemeNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542267, "社保方案名称")).get(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542267, "社保方案名称"))); HashMap oldSocialBaseMap = new HashMap<>(); if (oldSocialSchemeInfos.size() > 0) { oldSocialSchemePO = oldSocialSchemeInfos.get(0); @@ -1265,7 +1265,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (employeeId == null) { return null; } - Long paymentOrg = paymentNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人")).get(SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人"))); + Long paymentOrg = paymentNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(user.getLanguage(),537996, "个税扣缴义务人")).get(SalaryI18nUtil.getI18nLabel(user.getLanguage(),537996, "个税扣缴义务人"))); List oldFundSchemeInfos = getFundSchemeMapper().getFundByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO .builder() .employeeId(employeeId) @@ -1275,9 +1275,9 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { InsuranceArchivesFundSchemePO insuranceArchivesFundSchemePO = new InsuranceArchivesFundSchemePO(); //设置公积金账号、起始缴纳月、最后缴纳月 - String fundAccount = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91486, "公积金账号")).get(SalaryI18nUtil.getI18nLabel(91486, "公积金账号")); - String supplementFundAccount = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91487, "补充公积金账号")).get(SalaryI18nUtil.getI18nLabel(91487, "补充公积金账号")); - Long fundSchemeId = schemeNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91485, "公积金方案名称")).get(SalaryI18nUtil.getI18nLabel(91485, "公积金方案名称"))); + String fundAccount = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542268, "公积金账号")).get(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542268, "公积金账号")); + String supplementFundAccount = (String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542270, "补充公积金账号")).get(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542270, "补充公积金账号")); + Long fundSchemeId = schemeNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542269, "公积金方案名称")).get(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542269, "公积金方案名称"))); HashMap oldFundBaseMap = new HashMap<>(); if (oldFundSchemeInfos.size() > 0) { oldFundSchemePO = oldFundSchemeInfos.get(0); @@ -1349,7 +1349,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { if (employeeId == null) { return null; - }Long paymentOrg = paymentNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人")).get(SalaryI18nUtil.getI18nLabel(91325, "个税扣缴义务人"))); + }Long paymentOrg = paymentNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(user.getLanguage(),537996, "个税扣缴义务人")).get(SalaryI18nUtil.getI18nLabel(user.getLanguage(),537996, "个税扣缴义务人"))); List oldOtherSchemeInfos = getOtherSchemeMapper().getOtherByEmployeeIdAndPayOrg(InsuranceArchivesEmployeePO .builder() .employeeId(employeeId) @@ -1359,7 +1359,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { InsuranceArchivesOtherSchemePO insuranceArchivesOtherSchemePO = new InsuranceArchivesOtherSchemePO(); //设置其他福利方案、起始缴纳月、最后缴纳月 - Long otherSchemeId = schemeNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称")).get(SalaryI18nUtil.getI18nLabel(91496, "其他福利方案名称"))); + Long otherSchemeId = schemeNameIdMap.get((String) findElement(singleAccount, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542271, "其他福利方案名称")).get(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542271, "其他福利方案名称"))); HashMap oldOtherBaseMap = new HashMap<>(); if (oldOtherSchemeInfos.size() > 0) { oldOtherSchemePO = oldOtherSchemeInfos.get(0);