薪酬系统-多语言，修改部分表述中占位符的问题

src/com/engine/salary/entity/salaryacct/bo/SalaryAcctCalculatePriorityBO.java

@@ -198,7 +198,7 @@ public class SalaryAcctCalculatePriorityBO {
         if (Objects.equals(pre.getSalaryItemId(), current.getSalaryItemId())) {
             SalaryItemPO preSalaryItemPO = salaryItemPOMap.get(pre.getSalaryItemId());
             SalaryItemPO currentSalaryItemPO = salaryItemPOMap.get(current.getSalaryItemId());
-            String errMsg = SalaryI18nUtil.getI18nLabel(user.getLanguage(),542636, "以下项目的公式中存在相互引用") + "：{0}、{1}"
+            String errMsg = (SalaryI18nUtil.getI18nLabel(user.getLanguage(),542636, "以下项目的公式中存在相互引用") + "：{0}、{1}")
                     .replace("{0}", Optional.ofNullable(preSalaryItemPO).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY))
                     .replace("{1}", Optional.ofNullable(currentSalaryItemPO).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY));
 //            String errMsg = SalaryI18nUtil.getI18nLabel(user.getLanguage(),101426, "{0}和{1}的公式中存在相互引用")

src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java

@@ -104,8 +104,8 @@ public class SalarySobBO {
                 salaryCycleStr = Objects.equals(salaryCycleFromDay, 1)
                         ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),542652, "上上个月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542653, "第一天") + "——"
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542652, "上上个月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542654, "最后一天")
-                        : SalaryI18nUtil.getI18nLabel(user.getLanguage(),542652, "上上个月") + "-{0}——"
-                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),27347, "上个月") + "-{1}"
+                        : (SalaryI18nUtil.getI18nLabel(user.getLanguage(),542652, "上上个月") + "-{0}——"
+                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),27347, "上个月") + "-{1}")
                         .replace("{0}", "" + salaryCycleFromDay)
                         .replace("{1}", "" + (salaryCycleFromDay - 1));
                 break;
@@ -118,8 +118,8 @@ public class SalarySobBO {
                 salaryCycleStr = Objects.equals(salaryCycleFromDay, 1)
                         ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),27347, "上个月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542653, "第一天") + "——"
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),27347, "上个月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542654, "最后一天")
-                        : SalaryI18nUtil.getI18nLabel(user.getLanguage(),27347, "上个月") + "-{0}——"
-                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),15541, "本月") + "-{1}"
+                        : (SalaryI18nUtil.getI18nLabel(user.getLanguage(),27347, "上个月") + "-{0}——"
+                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),15541, "本月") + "-{1}")
                         .replace("{0}", "" + salaryCycleFromDay)
                         .replace("{1}", "" + (salaryCycleFromDay - 1));
                 break;
@@ -132,8 +132,8 @@ public class SalarySobBO {
                 salaryCycleStr = Objects.equals(salaryCycleFromDay, 1)
                         ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),15541, "本月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542653, "第一天") + "——"
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),15541, "本月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542654, "最后一天")
-                        : SalaryI18nUtil.getI18nLabel(user.getLanguage(),15541, "本月") + "-{0}——"
-                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),27348, "下个月") + "-{1}"
+                        : (SalaryI18nUtil.getI18nLabel(user.getLanguage(),15541, "本月") + "-{0}——"
+                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),27348, "下个月") + "-{1}")
                         .replace("{0}", "" + salaryCycleFromDay)
                         .replace("{1}", "" + (salaryCycleFromDay - 1));
                 break;
@@ -146,8 +146,8 @@ public class SalarySobBO {
                 salaryCycleStr = Objects.equals(salaryCycleFromDay, 1)
                         ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),27348, "下个月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542653, "第一天") + "——"
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),27348, "下个月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542654, "最后一天")
-                        : SalaryI18nUtil.getI18nLabel(user.getLanguage(),27348, "下个月") + "-{0}——"
-                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542655, "下下个月") + "-{1}"
+                        : (SalaryI18nUtil.getI18nLabel(user.getLanguage(),27348, "下个月") + "-{0}——"
+                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542655, "下下个月") + "-{1}")
                         .replace("{0}", "" + salaryCycleFromDay)
                         .replace("{1}", "" + (salaryCycleFromDay - 1));
                 break;

src/com/engine/salary/entity/taxdeclaration/dto/TaxDeclarationWageListDTO.java

@@ -33,103 +33,103 @@ public class TaxDeclarationWageListDTO {
     //人员id
     private Long employeeId;
 
-    @SalaryTableColumn(text = "工号", width = "10%", column = "jobNum")
+    @SalaryTableColumn(text = "工号", width = "10%", column = "jobNum", labelId = 1933)
     @TableTitle(title = "工号", dataIndex = "jobNum", key = "jobNum", labelId = 1933)
     private String jobNum;
 
-    @SalaryTableColumn(text = "姓名", width = "10%", column = "username")
+    @SalaryTableColumn(text = "姓名", width = "10%", column = "username", labelId = 25034)
     @TableTitle(title = "姓名", dataIndex = "username", key = "username", labelId = 25034)
     private String username;
 
-    @SalaryTableColumn(text = "证件类型", width = "10%", column = "cardType")
+    @SalaryTableColumn(text = "证件类型", width = "10%", column = "cardType", labelId = 23787)
     @TableTitle(title = "证件类型", dataIndex = "cardType", key = "cardType", labelId = 23787)
     private String cardType;
 
-    @SalaryTableColumn(text = "证件号码", width = "10%", column = "cardNum")
+    @SalaryTableColumn(text = "证件号码", width = "10%", column = "cardNum", labelId = 1839)
     @TableTitle(title = "证件号码", dataIndex = "cardNum", key = "cardNum", labelId = 1839)
     private String cardNum;
 
-    @SalaryTableColumn(text = "本期收入", width = "10%", column = "income")
+    @SalaryTableColumn(text = "本期收入", width = "10%", column = "income", labelId = 544405)
     @TableTitle(title = "本期收入", dataIndex = "income", key = "income", labelId = 544405)
     private String income;
 
-    @SalaryTableColumn(text = "本期免税收入", width = "10%", column = "taxFreeIncome")
+    @SalaryTableColumn(text = "本期免税收入", width = "10%", column = "taxFreeIncome", labelId = 544404)
     @TableTitle(title = "本期免税收入", dataIndex = "taxFreeIncome", key = "taxFreeIncome", labelId = 544404)
     private String taxFreeIncome;
 
-    @SalaryTableColumn(text = "基本养老保险费", width = "10%", column = "endowmentInsurance")
+    @SalaryTableColumn(text = "基本养老保险费", width = "10%", column = "endowmentInsurance", labelId = 542664)
     @TableTitle(title = "基本养老保险费", dataIndex = "endowmentInsurance", key = "endowmentInsurance", labelId = 542664)
     private String endowmentInsurance;
 
-    @SalaryTableColumn(text = "基本医疗保险费", width = "10%", column = "medicalInsurance")
+    @SalaryTableColumn(text = "基本医疗保险费", width = "10%", column = "medicalInsurance", labelId = 542665)
     @TableTitle(title = "基本医疗保险费", dataIndex = "medicalInsurance", key = "medicalInsurance", labelId = 542665)
     private String medicalInsurance;
 
-    @SalaryTableColumn(text = "失业保险费", width = "10%", column = "unemploymentInsurance")
+    @SalaryTableColumn(text = "失业保险费", width = "10%", column = "unemploymentInsurance", labelId = 542666)
     @TableTitle(title = "失业保险费", dataIndex = "unemploymentInsurance", key = "unemploymentInsurance", labelId = 542666)
     private String unemploymentInsurance;
 
-    @SalaryTableColumn(text = "住房公积金", width = "10%", column = "housingProvidentFund")
+    @SalaryTableColumn(text = "住房公积金", width = "10%", column = "housingProvidentFund", labelId = 25141)
     @TableTitle(title = "住房公积金", dataIndex = "housingProvidentFund", key = "housingProvidentFund", labelId = 25141)
     private String housingProvidentFund;
 
-    @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation")
+    @SalaryTableColumn(text = "累计子女教育", width = "10%", column = "addUpChildEducation", labelId = 542158)
     @TableTitle(title = "累计子女教育", dataIndex = "addUpChildEducation", key = "addUpChildEducation", labelId = 542158)
     private String addUpChildEducation;
 
-    @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest")
+    @SalaryTableColumn(text = "累计住房贷款利息", width = "10%", column = "addUpHousingLoanInterest", labelId = 542160)
     @TableTitle(title = "累计住房贷款利息", dataIndex = "addUpHousingLoanInterest", key = "addUpHousingLoanInterest", labelId = 542160)
     private String addUpHousingLoanInterest;
 
-    @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent")
+    @SalaryTableColumn(text = "累计住房租金", width = "10%", column = "addUpHousingRent", labelId = 542161)
     @TableTitle(title = "累计住房租金", dataIndex = "addUpHousingRent", key = "addUpHousingRent", labelId = 542161)
     private String addUpHousingRent;
 
-    @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation")
+    @SalaryTableColumn(text = "累计继续教育", width = "10%", column = "addUpContinuingEducation", labelId = 542159)
     @TableTitle(title = "累计继续教育", dataIndex = "addUpContinuingEducation", key = "addUpContinuingEducation", labelId = 542159)
     private String addUpContinuingEducation;
 
-    @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly")
+    @SalaryTableColumn(text = "累计赡养老人", width = "10%", column = "addUpSupportElderly", labelId = 542162)
     @TableTitle(title = "累计赡养老人", dataIndex = "addUpSupportElderly", key = "addUpSupportElderly", labelId = 542162)
     private String addUpSupportElderly;
 
-    @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical")
+    @SalaryTableColumn(text = "累计大病医疗", width = "10%", column = "addUpIllnessMedical", labelId = 542163)
     @TableTitle(title = "累计大病医疗", dataIndex = "addUpIllnessMedical", key = "addUpIllnessMedical", labelId = 542163)
     private String addUpIllnessMedical;
 
-    @SalaryTableColumn(text = "累计3岁以下婴幼儿照护", width = "10%", column = "addUpInfantCare")
+    @SalaryTableColumn(text = "累计3岁以下婴幼儿照护", width = "10%", column = "addUpInfantCare", labelId = 544403)
     @TableTitle(title = "累计3岁以下婴幼儿照护", dataIndex = "addUpInfantCare", key = "addUpInfantCare", labelId = 544403)
     private String addUpInfantCare;
 
-    @SalaryTableColumn(text = "累计个人养老金", width = "10%", column = "addUpPrivatePension")
+    @SalaryTableColumn(text = "累计个人养老金", width = "10%", column = "addUpPrivatePension", labelId = 542863)
     @TableTitle(title = "累计个人养老金", dataIndex = "addUpPrivatePension", key = "addUpPrivatePension", labelId = 542863)
     private String addUpPrivatePension;
 
-    @SalaryTableColumn(text = "企业（职业）年金", width = "10%", column = "annuity")
+    @SalaryTableColumn(text = "企业（职业）年金", width = "10%", column = "annuity", labelId = 544402)
     @TableTitle(title = "企业（职业）年金", dataIndex = "annuity", key = "annuity", labelId = 544402)
     private String annuity;
 
-    @SalaryTableColumn(text = "商业健康保险", width = "10%", column = "commercialHealthInsurance")
+    @SalaryTableColumn(text = "商业健康保险", width = "10%", column = "commercialHealthInsurance", labelId = 542292)
     @TableTitle(title = "商业健康保险", dataIndex = "commercialHealthInsurance", key = "commercialHealthInsurance", labelId = 542292)
     private String commercialHealthInsurance;
 
-    @SalaryTableColumn(text = "税延养老保险", width = "10%", column = "taxDeferredEndowmentInsurance")
+    @SalaryTableColumn(text = "税延养老保险", width = "10%", column = "taxDeferredEndowmentInsurance", labelId = 542293)
     @TableTitle(title = "税延养老保险", dataIndex = "taxDeferredEndowmentInsurance", key = "taxDeferredEndowmentInsurance", labelId = 542293)
     private String taxDeferredEndowmentInsurance;
 
-    @SalaryTableColumn(text = "其他", width = "10%", column = "other")
+    @SalaryTableColumn(text = "其他", width = "10%", column = "other", labelId = 25740)
     @TableTitle(title = "其他", dataIndex = "other", key = "other", labelId = 25740)
     private String other;
 
-    @SalaryTableColumn(text = "准予扣除的捐赠额", width = "10%", column = "allowedDonation")
+    @SalaryTableColumn(text = "准予扣除的捐赠额", width = "10%", column = "allowedDonation", labelId = 542294)
     @TableTitle(title = "准予扣除的捐赠额", dataIndex = "allowedDonation", key = "allowedDonation", labelId = 542294)
     private String allowedDonation;
 
-    @SalaryTableColumn(text = "减免税额", width = "10%", column = "taxDeduction")
+    @SalaryTableColumn(text = "减免税额", width = "10%", column = "taxDeduction", labelId = 542675)
     @TableTitle(title = "减免税额", dataIndex = "taxDeduction", key = "taxDeduction", labelId = 542675)
     private String taxDeduction;
 
-    @SalaryTableColumn(text = "备注", width = "10%", column = "description")
+    @SalaryTableColumn(text = "备注", width = "10%", column = "description", labelId = 536726)
     @TableTitle(title = "备注", dataIndex = "description", key = "description", labelId = 536726)
     private String description;
 }

src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java

@@ -380,12 +380,12 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
                     .findAny()
                     .orElse(null);
             if (Objects.nonNull(hasArchivedSalaryAcctRecordPO)) {
-                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
+                throw new SalaryRunTimeException((SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
                         + "{0}"
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542327, "薪资核算结果已经归档，")
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
                         + "{1}"
-                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542326, "不能新建薪资核算")
+                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542326, "不能新建薪资核算"))
                         .replace("{0}", SalaryDateUtil.localDate2YearMonth(hasArchivedSalaryAcctRecordPO.getTaxCycle()).toString())
                         .replace("{1}", salarySobCycleDTO.getTaxCycle().toString()));
 //                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),98752, "税款所属期{0}的薪资核算结果已经归档，不能新建税款所属期{1}的薪资核算")
@@ -399,12 +399,12 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
                     .findAny()
                     .orElse(null);
             if (Objects.nonNull(notDeclaredSalaryAcctRecordPO)) {
-                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
+                throw new SalaryRunTimeException((SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
                         + "{0}"
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542328, "薪资核算结果还未申报，")
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
                         + "{1}"
-                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542326, "不能新建薪资核算")
+                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542326, "不能新建薪资核算"))
                         .replace("{0}", SalaryDateUtil.localDate2YearMonth(notDeclaredSalaryAcctRecordPO.getTaxCycle()).toString())
                         .replace("{1}", salarySobCycleDTO.getTaxCycle().toString()));
 //                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),98751, "税款所属期{0}的薪资核算结果还未申报，不能新建税款所属期{1}的薪资核算")
@@ -418,12 +418,12 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
                     .findAny()
                     .orElse(null);
             if (Objects.nonNull(hasDeclaredSalaryAcctRecordPO)) {
-                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
+                throw new SalaryRunTimeException((SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
                         + "{0}"
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542329, "薪资核算结果已经申报，")
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
                         + "{1}"
-                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542326, "不能新建薪资核算")
+                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542326, "不能新建薪资核算"))
                         .replace("{0}", SalaryDateUtil.localDate2YearMonth(hasDeclaredSalaryAcctRecordPO.getTaxCycle()).toString())
                         .replace("{1}", salarySobCycleDTO.getTaxCycle().toString()));
 //                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),98753, "税款所属期{0}的薪资核算结果已经申报，不能新建税款所属期{1}的薪资核算")
@@ -440,12 +440,12 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
                     .findAny()
                     .orElse(null);
             if (Objects.nonNull(notArchivedSalaryAcctRecordPO)) {
-                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542324, "薪资所属期")
+                throw new SalaryRunTimeException((SalaryI18nUtil.getI18nLabel(user.getLanguage(),542324, "薪资所属期")
                         + "{0}"
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542325, "薪资核算结果还未归档，")
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542324, "薪资所属期")
                         + "{1}"
-                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542326, "不能新建薪资核算")
+                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542326, "不能新建薪资核算"))
                         .replace("{0}", SalaryDateUtil.localDate2YearMonth(notArchivedSalaryAcctRecordPO.getTaxCycle()).toString())
                         .replace("{1}", salarySobCycleDTO.getTaxCycle().toString()));
 //                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),98754, "薪资所属期{0}的薪资核算结果还未归档，不能新建薪资所属期{1}的薪资核算")
@@ -459,12 +459,12 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
                     .findAny()
                     .orElse(null);
             if (Objects.nonNull(hasArchivedSalaryAcctRecordPO)) {
-                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
+                throw new SalaryRunTimeException((SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
                         + "{0}"
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542327, "薪资核算结果已经归档，")
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
                         + "{1}"
-                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542326, "不能新建薪资核算")
+                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542326, "不能新建薪资核算"))
                         .replace("{0}", SalaryDateUtil.localDate2YearMonth(hasArchivedSalaryAcctRecordPO.getTaxCycle()).toString())
                         .replace("{1}", salarySobCycleDTO.getTaxCycle().toString()));
 //                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),98752, "税款所属期{0}的薪资核算结果已经归档，不能新建税款所属期{1}的薪资核算")
@@ -490,12 +490,12 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
                     .findAny()
                     .orElse(null);
             if (Objects.nonNull(notDeclaredSalaryAcctRecordPO)) {
-                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
+                throw new SalaryRunTimeException((SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
                         + "{0}"
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542328, "薪资核算结果还未申报，")
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
                         + "{1}"
-                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542326, "不能新建薪资核算")
+                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542326, "不能新建薪资核算"))
                         .replace("{0}", SalaryDateUtil.localDate2YearMonth(notDeclaredSalaryAcctRecordPO.getTaxCycle()).toString())
                         .replace("{1}", salarySobCycleDTO.getTaxCycle().toString()));
 //                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),98751, "税款所属期{0}的薪资核算结果还未申报，不能新建税款所属期{1}的薪资核算")
@@ -510,12 +510,12 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
                     .findAny()
                     .orElse(null);
             if (Objects.nonNull(hasDeclaredSalaryAcctRecordPO)) {
-                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
+                throw new SalaryRunTimeException((SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
                         + "{0}"
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542329, "薪资核算结果已经申报，")
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542240, "税款所属期")
                         + "{1}"
-                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542326, "不能新建薪资核算")
+                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542326, "不能新建薪资核算"))
                         .replace("{0}", SalaryDateUtil.localDate2YearMonth(hasDeclaredSalaryAcctRecordPO.getTaxCycle()).toString())
                         .replace("{1}", salarySobCycleDTO.getTaxCycle().toString()));
 //                throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),98753, "税款所属期{0}的薪资核算结果已经申报，不能新建税款所属期{1}的薪资核算")
@@ -721,11 +721,11 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
                 .findAny()
                 .orElse(null);
         if (Objects.nonNull(afterSalaryAcctRecordPO)) {
-            throw new SalaryRunTimeException(
+            throw new SalaryRunTimeException((
                     "{0}"
                     + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542335, "已经存在薪资核算记录，")
                     + "{1}"
-                    + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542336, "不能重新核算薪资")
+                    + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542336, "不能重新核算薪资"))
                     .replace("{0}", SalaryDateUtil.localDate2YearMonth(afterSalaryAcctRecordPO.getSalaryMonth()).toString())
                     .replace("{1}", SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()).toString()));
 //            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),105826, "已经存在{0}的薪资核算记录了，不能重新核算{1}的薪资了")

src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java

@@ -187,8 +187,8 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
         List<TaxDeclarationPO> taxDeclarationPOS = listBySalaryMonthTax(TaxDeclarationPO.builder().salaryMonths(salaryMonthDateRange).taxAgentIds(taxAgentNameMap.keySet()).build());
         // 已经生成过个税申报表，不允许再次生成个税申报表
         if (CollectionUtils.isNotEmpty(taxDeclarationPOS)) {
-            throw new SalaryRunTimeException("{0}-{1}"
-                    + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542576, "已经生成过个税申报表，不允许再次生成")
+            throw new SalaryRunTimeException(("{0}-{1}"
+                    + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542576, "已经生成过个税申报表，不允许再次生成"))
                     .replace("{0}", taxAgentNameMap.get(taxDeclarationPOS.get(0).getTaxAgentId()))
                     .replace("{1}", saveParam.getSalaryMonth().toString()));
 //            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),107986, "{0}在{1}已经生成过个税申报表，不允许再次生成")
@@ -199,7 +199,7 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
         List<SalaryAcctRecordPO> salaryAcctRecordPOS = listBySalaryMonth(SalaryAcctRecordPO.builder().salaryMonths(salaryMonthDateRange).build());
         // 无薪资核算记录，不允许生成个税申报表
         if (CollectionUtils.isEmpty(salaryAcctRecordPOS)) {
-            throw new SalaryRunTimeException("{0}" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542577, "无申报数据").replace("{0}", saveParam.getSalaryMonth().toString()));
+            throw new SalaryRunTimeException(("{0}" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542577, "无申报数据")).replace("{0}", saveParam.getSalaryMonth().toString()));
 //            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),98874, "{0}无申报数据").replace("{0}", saveParam.getSalaryMonth().toString()));
         }
         // 查询薪资核算结果
@@ -208,7 +208,7 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
 
         // 无薪资核算结果，不允许生成个税申报表
         if (CollectionUtils.isEmpty(salaryAcctResultPOS)) {
-            throw new SalaryRunTimeException("{0}" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542578, "无可申报数据")
+            throw new SalaryRunTimeException(("{0}" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542578, "无可申报数据"))
                     .replace("{0}", saveParam.getSalaryMonth().toString()));
 //            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),110093, "{0}无可申报数据")
 //                    .replace("{0}", saveParam.getSalaryMonth().toString()));
@@ -219,7 +219,7 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
         // 如果存在未归档的，也不允许生成个税申报表
         boolean notArchived = salaryAcctRecordPOS.stream().anyMatch(salaryAcctRecordPO -> Objects.equals(salaryAcctRecordPO.getStatus(), SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue()));
         if (notArchived) {
-            throw new SalaryRunTimeException("{0}" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542579, "有未归档数据，请全部归档后再申报")
+            throw new SalaryRunTimeException(("{0}" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542579, "有未归档数据，请全部归档后再申报"))
                     .replace("{0}", saveParam.getSalaryMonth().toString()));
 //            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),98875, "{0}有未归档数据，请全部归档后再申报")
 //                    .replace("{0}", saveParam.getSalaryMonth().toString()));
@@ -228,7 +228,7 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
         Date taxCycle = salaryAcctRecordPOS.get(0).getTaxCycle();
         boolean differentTaxCycle = salaryAcctRecordPOS.stream().anyMatch(salaryAcctRecordPO -> salaryAcctRecordPO.getTaxCycle().compareTo(taxCycle) != 0);
         if (differentTaxCycle) {
-            throw new SalaryRunTimeException("{0}" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542580, "存在不同的税款所属期，无法正常生成个税申报表，请调整账套设置，重新核算后再生成个税申报表")
+            throw new SalaryRunTimeException(("{0}" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542580, "存在不同的税款所属期，无法正常生成个税申报表，请调整账套设置，重新核算后再生成个税申报表"))
                     .replace("{0}", saveParam.getSalaryMonth().toString()));
 //            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),98876, "{0}存在不同的税款所属期，无法正常生成个税申报表，请调整账套设置，重新核算后再生成个税申报表")
 //                    .replace("{0}", saveParam.getSalaryMonth().toString()));

src/com/engine/salary/transmethod/TransMethod.java

@@ -123,8 +123,8 @@ public class TransMethod {
                 salaryCycleStr = Objects.equals(salaryCycleFromDay, "1")
                         ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),542652, "上上个月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542653, "第一天") + "——"
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542652, "上上个月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542654, "最后一天")
-                        : SalaryI18nUtil.getI18nLabel(user.getLanguage(),542652, "上上个月") + "-{0}——"
-                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),27347, "上个月") + "-{1}"
+                        : (SalaryI18nUtil.getI18nLabel(user.getLanguage(),542652, "上上个月") + "-{0}——"
+                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),27347, "上个月") + "-{1}")
                         .replace("{0}", "" + salaryCycleFromDay)
                         .replace("{1}", "" + (Integer.parseInt(salaryCycleFromDay) - 1));
                 break;
@@ -136,8 +136,8 @@ public class TransMethod {
                 salaryCycleStr = Objects.equals(salaryCycleFromDay, "1")
                         ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),27347, "上个月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542653, "第一天") + "——"
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),27347, "上个月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542654, "最后一天")
-                        : SalaryI18nUtil.getI18nLabel(user.getLanguage(),27347, "上个月") + "-{0}——"
-                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),15541, "本月") + "-{1}"
+                        : (SalaryI18nUtil.getI18nLabel(user.getLanguage(),27347, "上个月") + "-{0}——"
+                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),15541, "本月") + "-{1}")
                         .replace("{0}", "" + salaryCycleFromDay)
                         .replace("{1}", "" + (Integer.parseInt(salaryCycleFromDay) - 1));
                 break;
@@ -149,8 +149,8 @@ public class TransMethod {
                 salaryCycleStr = Objects.equals(salaryCycleFromDay, "1")
                         ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),15541, "本月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542653, "第一天") + "——"
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),15541, "本月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542654, "最后一天")
-                        : SalaryI18nUtil.getI18nLabel(user.getLanguage(),15541, "本月") + "-{0}——"
-                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),27348, "下个月") + "-{1}"
+                        : (SalaryI18nUtil.getI18nLabel(user.getLanguage(),15541, "本月") + "-{0}——"
+                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),27348, "下个月") + "-{1}")
                         .replace("{0}", "" + salaryCycleFromDay)
                         .replace("{1}", "" + (Integer.parseInt(salaryCycleFromDay) - 1));
                 break;
@@ -162,8 +162,8 @@ public class TransMethod {
                 salaryCycleStr = Objects.equals(salaryCycleFromDay, "1")
                         ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),27348, "下个月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542653, "第一天") + "——"
                         + SalaryI18nUtil.getI18nLabel(user.getLanguage(),27348, "下个月") + "-" + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542654, "最后一天")
-                        : SalaryI18nUtil.getI18nLabel(user.getLanguage(),27348, "下个月") + "-{0}——"
-                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542655, "下下个月") + "-{1}"
+                        : (SalaryI18nUtil.getI18nLabel(user.getLanguage(),27348, "下个月") + "-{0}——"
+                        + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542655, "下下个月") + "-{1}")
                         .replace("{0}", "" + salaryCycleFromDay)
                         .replace("{1}", "" + (Integer.parseInt(salaryCycleFromDay) - 1));
                 break;

src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java

@@ -181,8 +181,8 @@ public class SalaryAcctEmployeeWrapper extends Service {
         List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = getSalaryAcctEmployeeService(user)
                 .listBySalaryAcctRecordIdAndTaxAgentId(salaryAcctRecordId, NumberUtils.LONG_ZERO);
         if (CollectionUtils.isNotEmpty(salaryAcctEmployeePOS)) {
-            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542589, "请先去薪资档案里维护员工档案，再点击当前页面的刷新按钮。")
-                    + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542590, "当前存在未设置个税扣缴义务人的员工数量") + "：{0}"
+            throw new SalaryRunTimeException((SalaryI18nUtil.getI18nLabel(user.getLanguage(),542589, "请先去薪资档案里维护员工档案，再点击当前页面的刷新按钮。")
+                    + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542590, "当前存在未设置个税扣缴义务人的员工数量") + "：{0}")
                     .replace("{0}", "" + salaryAcctEmployeePOS.size()));
 //            throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),98871, "有{0}个人无个税扣缴义务人，请先去薪资档案里维护员工档案，再点击当前页面的刷新按钮")
 //                    .replace("{0}", "" + salaryAcctEmployeePOS.size()));