diff --git a/src/com/engine/salary/action/CheckEditSalaryAction.java b/src/com/engine/salary/action/CheckEditSalaryAction.java index 7cee919f3..b0b0896e0 100644 --- a/src/com/engine/salary/action/CheckEditSalaryAction.java +++ b/src/com/engine/salary/action/CheckEditSalaryAction.java @@ -3,6 +3,7 @@ package com.engine.salary.action; import com.engine.common.util.ServiceUtil; import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportActionParam; import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.wrapper.SalaryArchiveWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -67,7 +68,7 @@ public class CheckEditSalaryAction implements Action { .build(); //操作人 - String uid = list.stream().filter(f -> f.salaryName.equals("操作人")).findFirst().map(SalaryField::getValue).orElse("1"); + String uid = list.stream().filter(f -> f.salaryName.equals(SalaryI18nUtil.getI18nLabel(17482, "操作人"))).findFirst().map(SalaryField::getValue).orElse("1"); Map map = getSalaryArchiveWrapper(new User(Integer.parseInt(uid))).checkAdjustmentSalaryArchive(build); List errorNotice = (List) map.get("errorNotice"); diff --git a/src/com/engine/salary/action/EditSalaryAction.java b/src/com/engine/salary/action/EditSalaryAction.java index eed5d1648..2f9a59852 100644 --- a/src/com/engine/salary/action/EditSalaryAction.java +++ b/src/com/engine/salary/action/EditSalaryAction.java @@ -3,6 +3,7 @@ package com.engine.salary.action; import com.engine.common.util.ServiceUtil; import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportActionParam; import com.engine.salary.util.SalaryEntityUtil; +import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.wrapper.SalaryArchiveWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -67,7 +68,7 @@ public class EditSalaryAction implements Action { .build(); //操作人 - String uid = list.stream().filter(f -> f.salaryName.equals("操作人")).findFirst().map(SalaryField::getValue).orElse("1"); + String uid = list.stream().filter(f -> f.salaryName.equals(SalaryI18nUtil.getI18nLabel(17482, "操作人"))).findFirst().map(SalaryField::getValue).orElse("1"); Map map = getSalaryArchiveWrapper(new User(Integer.parseInt(uid))).adjustmentSalaryArchive(build); List errorNotice = (List) map.get("errorNotice"); diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 7a5a3d6db..b06f433d3 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -258,7 +258,7 @@ public class SIAccountBiz extends Service { // 初始化进度 SalaryAcctProgressDTO initProgress = new SalaryAcctProgressDTO() - .setTitle(SalaryI18nUtil.getI18nLabel(97515, "核算中")) + .setTitle(SalaryI18nUtil.getI18nLabel(542322, "核算中")) .setTitleLabelId(97515L) .setTotalQuantity(NumberUtils.INTEGER_ONE) .setCalculatedQuantity(NumberUtils.INTEGER_ZERO) @@ -336,13 +336,13 @@ public class SIAccountBiz extends Service { // getSalaryAcctProgressService(user).fail(SalaryCacheKey.ACCT_PROGRESS + param.getBillMonth(), SalaryI18nUtil.getI18nLabel( 100468, "无需要核算的人员")); return; } -// SalaryAcctProgressDTO salaryAcctProgressDTO = new SalaryAcctProgressDTO(SalaryI18nUtil.getI18nLabel(97515, "核算中"), 97515L, ids.size(), 0, +// SalaryAcctProgressDTO salaryAcctProgressDTO = new SalaryAcctProgressDTO(SalaryI18nUtil.getI18nLabel(542322, "核算中"), 542322L, ids.size(), 0, // BigDecimal.ZERO, true, "", true); //salaryAcctProgressService.initProgress(tenantKey + param.getBillMonth(), salaryAcctProgressDTO, employeeId, tenantKey); // 初始化进度 SalaryAcctProgressDTO initProgress = new SalaryAcctProgressDTO() - .setTitle(SalaryI18nUtil.getI18nLabel(97515, "核算中")) + .setTitle(SalaryI18nUtil.getI18nLabel(542322, "核算中")) .setTitleLabelId(97515L) .setTotalQuantity(ids.size()) .setCalculatedQuantity(NumberUtils.INTEGER_ZERO) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index 6dec082bd..de67fb323 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -1049,7 +1049,7 @@ public class SIArchivesBiz { list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "jobNum")); list.add(new WeaTableColumn("150px", "入职日期", "companystartdate")); - list.add(new WeaTableColumn("150px", "离职日期", "dismissdate")); + list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(15961, "离职日期"), "dismissdate")); list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(542267, "社保方案名称"), "socialName")); titleMap.get(WelfareTypeEnum.SOCIAL_SECURITY.getValue()).forEach((k, v) -> list.add(new WeaTableColumn("150px", v, k))); @@ -1361,7 +1361,7 @@ public class SIArchivesBiz { statuses.setFieldcol(16); statuses.setLabelcol(8); statuses.setIsQuickSearch(true); - statuses.setLabel("状态"); + statuses.setLabel(SalaryI18nUtil.getI18nLabel(535101, "状态")); conditionItems.add(statuses); @@ -1399,7 +1399,7 @@ public class SIArchivesBiz { // dimissionDate.setFieldcol(16); // dimissionDate.setViewAttr(8); // dimissionDate.setFormat("yyyy-MM-dd"); -// dimissionDate.setLabel("离职日期"); +// dimissionDate.setLabel(SalaryI18nUtil.getI18nLabel(15961, "离职日期")); // conditionItems.add(dimissionDate); diff --git a/src/com/engine/salary/entity/agency/dto/PaymentAgencyFormDTO.java b/src/com/engine/salary/entity/agency/dto/PaymentAgencyFormDTO.java index d6fcbc80d..c307cbcff 100644 --- a/src/com/engine/salary/entity/agency/dto/PaymentAgencyFormDTO.java +++ b/src/com/engine/salary/entity/agency/dto/PaymentAgencyFormDTO.java @@ -43,7 +43,7 @@ public class PaymentAgencyFormDTO { // @SalaryForm( // label = "备注", -// labelId = 84961, +// labelId = 536726, // items = { // @SalaryFormItem( // itemType = WeaFormItemType.TEXTAREA, diff --git a/src/com/engine/salary/entity/agency/dto/PaymentAgencyListDTO.java b/src/com/engine/salary/entity/agency/dto/PaymentAgencyListDTO.java index 8f554125d..0cc8d55c9 100644 --- a/src/com/engine/salary/entity/agency/dto/PaymentAgencyListDTO.java +++ b/src/com/engine/salary/entity/agency/dto/PaymentAgencyListDTO.java @@ -47,7 +47,7 @@ public class PaymentAgencyListDTO { */ // @WeaFormat( // label = "备注", -// labelId = 84961, +// labelId = 536726, // tableColumn = @TableColumn(width = "300") // ) // @ApiModelProperty("备注") diff --git a/src/com/engine/salary/entity/datacollection/bo/AttendQuoteFieldBO.java b/src/com/engine/salary/entity/datacollection/bo/AttendQuoteFieldBO.java index 1124145c8..553f60363 100644 --- a/src/com/engine/salary/entity/datacollection/bo/AttendQuoteFieldBO.java +++ b/src/com/engine/salary/entity/datacollection/bo/AttendQuoteFieldBO.java @@ -26,7 +26,7 @@ public class AttendQuoteFieldBO { result.add(new WeaTableColumn("20%", SalaryI18nUtil.getI18nLabel(87617, "来源"), "sourceType")); result.add(new WeaTableColumn("20%", SalaryI18nUtil.getI18nLabel(84758, "类型"), "fieldType")); result.add(new WeaTableColumn("20%", SalaryI18nUtil.getI18nLabel(87629, "是否启用"), "enableStatus")); - result.add(new WeaTableColumn("20%", SalaryI18nUtil.getI18nLabel(84961, "备注"), "description")); + result.add(new WeaTableColumn("20%", SalaryI18nUtil.getI18nLabel(536726, "备注"), "description")); return result; } diff --git a/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java b/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java index babc789a9..e97d527ea 100644 --- a/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java +++ b/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java @@ -43,35 +43,35 @@ public class OtherDeductionPO { /** * 商业健康保险 */ - @SalaryFormulaVar(defaultLabel = "商业健康保险", labelId = 91238, dataType = "number") + @SalaryFormulaVar(defaultLabel = "商业健康保险", labelId = 542292, dataType = "number") @Encrypt private String businessHealthyInsurance; /** * 税延养老保险 */ - @SalaryFormulaVar(defaultLabel = "税延养老保险", labelId = 91239, dataType = "number") + @SalaryFormulaVar(defaultLabel = "税延养老保险", labelId = 542293, dataType = "number") @Encrypt private String taxDelayEndowmentInsurance; /** * 其他 */ - @SalaryFormulaVar(defaultLabel = "其他", labelId = 84500, dataType = "number") + @SalaryFormulaVar(defaultLabel = "其他", labelId = 25740, dataType = "number") @Encrypt private String otherDeduction; /** * 准予扣除的捐赠额 */ - @SalaryFormulaVar(defaultLabel = "准予扣除的捐赠额", labelId = 91240, dataType = "number") + @SalaryFormulaVar(defaultLabel = "准予扣除的捐赠额", labelId = 542294, dataType = "number") @Encrypt private String deductionAllowedDonation; /** * 个人养老金 */ - @SalaryFormulaVar(defaultLabel = "个人养老金", labelId = 91240, dataType = "number") + @SalaryFormulaVar(defaultLabel = "个人养老金", labelId = 542295, dataType = "number") @Encrypt private String privatePension; diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java index ed4ca8b57..9cc3dcaec 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalarySendListDTO.java @@ -50,7 +50,7 @@ public class SalarySendListDTO { // @ApiModelProperty("薪资账套") // @WeaFormat( // label = "薪资账套", -// labelId = 87889, +// labelId = 538010, // tableColumn = @TableColumn(width = "35%") // ) diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctEmpSearchConditionDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctEmpSearchConditionDTO.java index 65772ca55..0bb954613 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctEmpSearchConditionDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctEmpSearchConditionDTO.java @@ -46,14 +46,14 @@ public class SalaryAcctEmpSearchConditionDTO { // @SalarySearchCondition( // label = "状态", -// labelId = 91075, +// labelId = 535101, // items = @SalarySearchConditionItem(itemType = WeaSearchConditionItemType.SELECT, optionsEnum = SalaryEmployeeStatusEnum.class, name = "status") // ) private String status; // @SalarySearchCondition( // label = "离职日期", -// labelId = 95228, +// labelId = 15961, // items = @SalarySearchConditionItem(itemType = WeaSearchConditionItemType.DATEPICKER, name = "dismissDate", isRange = true) // ) private LocalDateRange dismissDate; diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultSearchConditionDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultSearchConditionDTO.java index 8c19277b4..04e4f31d1 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultSearchConditionDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctResultSearchConditionDTO.java @@ -47,14 +47,14 @@ public class SalaryAcctResultSearchConditionDTO { // @SalarySearchCondition( // label = "状态", -// labelId = 91075, +// labelId = 535101, // items = @SalarySearchConditionItem(itemType = WeaSearchConditionItemType.SELECT, optionsEnum = SalaryEmployeeStatusEnum.class, name = "status") // ) private String status; // @SalarySearchCondition( // label = "离职日期", -// labelId = 95228, +// labelId = 15961, // items = @SalarySearchConditionItem(itemType = WeaSearchConditionItemType.DATEPICKER, name = "dismissDate", isRange = true) // ) private LocalDateRange dismissDate; diff --git a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java index b308e55ce..7ea8816c6 100644 --- a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java +++ b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java @@ -82,10 +82,10 @@ public class SalaryArchiveBO { columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), "workcode")); columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(125238, "手机号"), "mobile")); columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(15890, "员工状态"), "employeeStatus")); - columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86187, "起始发薪日期"), "payStartDate")); - columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86187, "最后发薪日期"), "payEndDate")); + columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(542346, "起始发薪日期"), "payStartDate")); + columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(542347, "最后发薪日期"), "payEndDate")); columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(1516, "入职日期"), "companystartdate").setDisplay(WeaBoolAttr.FALSE)); - columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86187, "离职日期"), "dismissdate").setDisplay(WeaBoolAttr.FALSE)); + columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(15961, "离职日期"), "dismissdate").setDisplay(WeaBoolAttr.FALSE)); for (SalaryItemPO salaryItem : salaryItems) { columns.add(new WeaTableColumn("100px", salaryItem.getName(), salaryItem.getId() + SalaryItemConstant.DYNAMIC_SUFFIX)); } diff --git a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java index b6d8454df..9cb734bb4 100644 --- a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java +++ b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java @@ -104,12 +104,12 @@ public class SalaryArchiveExcelBO extends Service { notEmptyI18n = SalaryI18nUtil.getI18nLabel(100577, "不能为空"); - incomeCategoryI18n = SalaryI18nUtil.getI18nLabel(121908, "收入所得项目"); - salarySobI18n = SalaryI18nUtil.getI18nLabel(87889, "薪资账套"); - effectiveTimeI18n = SalaryI18nUtil.getI18nLabel(85904, "生效日期"); - payStartDateI18n = SalaryI18nUtil.getI18nLabel(109527, "起始发薪日期"); - payEndDateI18n = SalaryI18nUtil.getI18nLabel(109329, "最后发薪日期"); - adjustReasonI18n = SalaryI18nUtil.getI18nLabel(85431, "调整原因"); + incomeCategoryI18n = SalaryI18nUtil.getI18nLabel(542345, "收入所得项目"); + salarySobI18n = SalaryI18nUtil.getI18nLabel(538010, "薪资账套"); + effectiveTimeI18n = SalaryI18nUtil.getI18nLabel(19548, "生效日期"); + payStartDateI18n = SalaryI18nUtil.getI18nLabel(542346, "起始发薪日期"); + payEndDateI18n = SalaryI18nUtil.getI18nLabel(542347, "最后发薪日期"); + adjustReasonI18n = SalaryI18nUtil.getI18nLabel(1897, "调整原因"); listTypeErrMsg = SalaryI18nUtil.getI18nLabel(115527, "该条数据不符合当前列表导入要求或其他列表存在该档案，不可导入"); @@ -124,11 +124,11 @@ public class SalaryArchiveExcelBO extends Service { dateErr = SalaryI18nUtil.getI18nLabel(109819, "日期错误或格式不正确，正确格式示例为'2022-01-01'、'2022/1/1'"); - payStartUnableAfterEnd = SalaryI18nUtil.getI18nLabel(109214, "起始发薪日期不可晚于最后发薪日"); + payStartUnableAfterEnd = SalaryI18nUtil.getI18nLabel(542365, "起始发薪日期不可晚于最后发薪日"); - salaryItemNoBeforeCurrentEffectiveTime = SalaryI18nUtil.getI18nLabel(100429, "生效日期不可早于当前已生效的调整日期"); - salaryItemAdjustNoSame = SalaryI18nUtil.getI18nLabel(100432, "调整前后不可相同"); - salaryItemAdjustNoSameIneffective = SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同"); + salaryItemNoBeforeCurrentEffectiveTime = SalaryI18nUtil.getI18nLabel(542357, "生效日期不可早于当前已生效的调整日期"); + salaryItemAdjustNoSame = SalaryI18nUtil.getI18nLabel(542358, "调整前后不可相同"); + salaryItemAdjustNoSameIneffective = SalaryI18nUtil.getI18nLabel(542359, "与未生效的调整后不可相同"); salaryArchiveErr = SalaryI18nUtil.getI18nLabel(101723, "该员工的薪资档案记录有误，请检查"); numberErr = SalaryI18nUtil.getI18nLabel(508795, "请输入数字"); @@ -151,7 +151,7 @@ public class SalaryArchiveExcelBO extends Service { errorMsg = SalaryI18nUtil.getI18nLabel(100582, "参数必传"); } else if (StringUtils.isEmpty(listType)) { errorMsg = // SalaryI18nUtil.getI18nLabel( 100592, "导入类型必传") + "," + - SalaryI18nUtil.getI18nLabel(109712, "列表类型必传"); + SalaryI18nUtil.getI18nLabel(542370, "列表类型必传"); } else { Optional optionalListType = Arrays.stream(SalaryArchiveListTypeEnum.values()).filter(e -> e.getValue().equals(listType)).findFirst(); if (optionalListType.isPresent()) { @@ -159,7 +159,7 @@ public class SalaryArchiveExcelBO extends Service { if (optionalListType.get().getValue().equals(SalaryArchiveListTypeEnum.FIXED.getValue())) { Optional optional = Arrays.stream(SalaryArchiveImportTypeEnum.values()).filter(e -> e.getValue().equals(params.get("importType").toString())).findFirst(); if (!optional.isPresent()) { - errorMsg = SalaryI18nUtil.getI18nLabel(100593, "导入类型不正确"); + errorMsg = SalaryI18nUtil.getI18nLabel(542371, "导入类型不正确"); } else { // message.setDataType(message.getDataType() // + "-" + SalaryI18nUtil.getI18nLabel( optionalListType.get().getLabelId(), optionalListType.get().getDefaultLabel()) diff --git a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveItemBO.java b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveItemBO.java index e6dc16666..3e9aef32d 100644 --- a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveItemBO.java +++ b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveItemBO.java @@ -108,9 +108,9 @@ public class SalaryArchiveItemBO { // */ // public static List buildRecordTableColumns(boolean isView, Long employeeId, String tenantKey) { // List result = Lists.newArrayListWithExpectedSize(3); -// result.add(new SalaryWeaTableColumn(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 84960, "薪资项目"), "salaryItem", "150", WeaAlignEnum.CENTER.getStringVal(), "salaryItem", !isView)); -// result.add(new SalaryWeaTableColumn(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 85433, "调整前"), "salaryBefore", "150", WeaAlignEnum.CENTER.getStringVal(), "salaryBefore")); -// result.add(new SalaryWeaTableColumn(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 85434, "调整后"), "adjustAfter", "150", WeaAlignEnum.CENTER.getStringVal(), "adjustAfter", !isView)); +// result.add(new SalaryWeaTableColumn(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 542362, "薪资项目"), "salaryItem", "150", WeaAlignEnum.CENTER.getStringVal(), "salaryItem", !isView)); +// result.add(new SalaryWeaTableColumn(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 130510, "调整前"), "salaryBefore", "150", WeaAlignEnum.CENTER.getStringVal(), "salaryBefore")); +// result.add(new SalaryWeaTableColumn(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 130511, "调整后"), "adjustAfter", "150", WeaAlignEnum.CENTER.getStringVal(), "adjustAfter", !isView)); // return result; // } @@ -302,11 +302,11 @@ public class SalaryArchiveItemBO { // SalaryArchiveItemPO ineffectiveSalaryItem = CollectionUtils.isEmpty(ineffectiveItemListMap.get(salaryArchive.getId() + "-" + e.getSalaryItemId())) ? null : ineffectiveItemListMap.get(salaryArchive.getId() + "-" + e.getSalaryItemId()).get(0); // SalaryItemAdjustValidDTO salaryItemAdjustValid = handleSalaryItemAdjustValid(effectiveSalaryItem, effectiveBeforeSalaryItem, ineffectiveSalaryItem, saveEffectiveTime, today, e.getAdjustValue(), effectiveSalaryItemDels); // if (salaryItemAdjustValid.isBefore()) { -// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100429, "生效日期不可早于当前已生效的调整日期")); +// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 542357, "生效日期不可早于当前已生效的调整日期")); // } else if (salaryItemAdjustValid.isSame()) { -// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100432, "调整前后不可相同")); +// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 542358, "调整前后不可相同")); // } else if (salaryItemAdjustValid.isSameIneffective()) { -// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 100434, "与未生效的调整后不可相同")); +// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(tenantKey, employeeId, 542359, "与未生效的调整后不可相同")); // } // // salaryArchiveItemNews.add(SalaryArchiveItemBO.buildInsert(salaryArchive, e.getSalaryItemId(), e.getAdjustValue(), saveParam, nowTime, employeeId, tenantKey)); diff --git a/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveItemBaseDTO.java b/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveItemBaseDTO.java index 479581e4e..9badca090 100644 --- a/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveItemBaseDTO.java +++ b/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveItemBaseDTO.java @@ -22,7 +22,7 @@ public class SalaryArchiveItemBaseDTO { // @SalaryForm( // label = "生效日期", -// labelId = 85904, +// labelId = 19548, // items = { // @SalaryFormItem(itemType = WeaFormItemType.DATEPICKER, required = true) // } @@ -32,7 +32,7 @@ public class SalaryArchiveItemBaseDTO { // @SalaryForm( // label = "调整原因", -// labelId = 85431, +// labelId = 1897, // items = { // @SalaryFormItem(itemType = WeaFormItemType.SELECT, required = true, maxLength = "50", options = "getAdjustReasonOptions()") // } @@ -46,7 +46,7 @@ public class SalaryArchiveItemBaseDTO { // @SalaryForm( // label = "备注", -// labelId = 84961, +// labelId = 536726, // items = { // @SalaryFormItem(itemType = WeaFormItemType.INPUT, maxLength = "20") // } diff --git a/src/com/engine/salary/entity/salaryarchive/dto/TaxAgentFormDTO.java b/src/com/engine/salary/entity/salaryarchive/dto/TaxAgentFormDTO.java index 94eee9bea..e17195f0d 100644 --- a/src/com/engine/salary/entity/salaryarchive/dto/TaxAgentFormDTO.java +++ b/src/com/engine/salary/entity/salaryarchive/dto/TaxAgentFormDTO.java @@ -30,7 +30,7 @@ public class TaxAgentFormDTO { // // @WeaFormat( // label = "备注", -// labelId = 84961, +// labelId = 536726, // from = @Form(itemType = WeaFormItemType.INPUT, maxLength = "20") // ) // //备注") diff --git a/src/com/engine/salary/entity/salaryarchive/dto/TaxAgentListDTO.java b/src/com/engine/salary/entity/salaryarchive/dto/TaxAgentListDTO.java index 910f0c619..26d4ab39f 100644 --- a/src/com/engine/salary/entity/salaryarchive/dto/TaxAgentListDTO.java +++ b/src/com/engine/salary/entity/salaryarchive/dto/TaxAgentListDTO.java @@ -38,7 +38,7 @@ public class TaxAgentListDTO { // //备注") // @WeaFormat( // label = "备注", -// labelId = 84961, +// labelId = 536726, // tableColumn = @TableColumn(width = "40%") // ) private String description; diff --git a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemSearchConditionDTO.java b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemSearchConditionDTO.java index ebb6836b5..71f2b9b5c 100644 --- a/src/com/engine/salary/entity/salaryitem/dto/SalaryItemSearchConditionDTO.java +++ b/src/com/engine/salary/entity/salaryitem/dto/SalaryItemSearchConditionDTO.java @@ -30,7 +30,7 @@ // // @SalarySearchCondition( // label = "薪资项目", -// labelId = 84960, +// labelId = 542362, // needQuickSearch = true, // quickSearchKey = "name", // items = { @@ -41,7 +41,7 @@ // // @SalarySearchCondition( // label = "备注", -// labelId = 84961, +// labelId = 536726, // items = { // @SalarySearchConditionItem(itemType = WeaSearchConditionItemType.INPUT, name = "description"), // } diff --git a/src/com/engine/salary/entity/salaryitem/dto/SysSalaryItemSearchConditionDTO.java b/src/com/engine/salary/entity/salaryitem/dto/SysSalaryItemSearchConditionDTO.java index c86a3973f..93054d1d6 100644 --- a/src/com/engine/salary/entity/salaryitem/dto/SysSalaryItemSearchConditionDTO.java +++ b/src/com/engine/salary/entity/salaryitem/dto/SysSalaryItemSearchConditionDTO.java @@ -30,7 +30,7 @@ // // @SalarySearchCondition( // label = "薪资项目", -// labelId = 84960, +// labelId = 542362, // needQuickSearch = true, // quickSearchKey = "name", // items = { diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobCheckRuleFormDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobCheckRuleFormDTO.java index 2dd4decd5..eb1a50f1f 100644 --- a/src/com/engine/salary/entity/salarysob/dto/SalarySobCheckRuleFormDTO.java +++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobCheckRuleFormDTO.java @@ -45,7 +45,7 @@ public class SalarySobCheckRuleFormDTO { // @SalaryForm( // label = "备注", -// labelId = 84961, +// labelId = 536726, // items = @SalaryFormItem(itemType = WeaFormItemType.INPUT, maxLength = "20") // ) //备注") diff --git a/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java b/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java index 46fc811ce..a443f8475 100644 --- a/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java +++ b/src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java @@ -97,17 +97,17 @@ public class InsuranceComparisonResultBO { columns.add(new Column(SalaryI18nUtil.getI18nLabel(542275, "个人合计"), "perSum", "perSum")); //社保单位（生育保险单位、工伤保险单位、失业保险单位、养老保险单位、医疗保险单位） for (ICategoryPO po : socialWelfareList) { - columns.add(new Column(po.getInsuranceName() + "单位", po.getId() + "socialCom", po.getId() + "socialCom")); + columns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(1329, "单位"), po.getId() + "socialCom", po.getId() + "socialCom")); } columns.add(new Column(SalaryI18nUtil.getI18nLabel(542276, "社保单位合计"), "socialComSum", "socialComSum")); //住房公积金单位、补充住房公积金单位 for (ICategoryPO po : fundWelfareList) { - columns.add(new Column(po.getInsuranceName() + "单位", po.getId() + "fundCom", po.getId() + "fundCom")); + columns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(1329, "单位"), po.getId() + "fundCom", po.getId() + "fundCom")); } columns.add(new Column(SalaryI18nUtil.getI18nLabel(542277, "公积金单位合计"), "fundComSum", "fundComSum")); //其他单位（比如企业年金单位） for (ICategoryPO po : otherWelfareList) { - columns.add(new Column(po.getInsuranceName() + "单位", po.getId() + "otherCom", po.getId() + "otherCom")); + columns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(1329, "单位"), po.getId() + "otherCom", po.getId() + "otherCom")); } columns.add(new Column(SalaryI18nUtil.getI18nLabel(542278, "其他福利单位合计"), "otherComSum", "otherComSum")); columns.add(new Column(SalaryI18nUtil.getI18nLabel(542279, "单位合计"), "comSum", "comSum")); diff --git a/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java b/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java index 47d2a5b61..3e1fdd4a9 100644 --- a/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java +++ b/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java @@ -81,7 +81,7 @@ public class TaxAgentBO { String admins = SalaryI18nUtil.getI18nLabel(106259, "管理员"); String subAdmins = SalaryI18nUtil.getI18nLabel(106283, "分管理员"); // String paymentAgency = SalaryI18nUtil.getI18nLabel(112448, "社保福利代缴机构"); - String description = SalaryI18nUtil.getI18nLabel(84961, "备注"); + String description = SalaryI18nUtil.getI18nLabel(536726, "备注"); if (isOpenDevolution) { columns.add(new Column(name, "name", "name%")); columns.add(new Column(employeeRange, "employeeRange", "employeeRange")); diff --git a/src/com/engine/salary/entity/taxagent/dto/TaxAgentAdjustRecordForFormSearchConditionDTO.java b/src/com/engine/salary/entity/taxagent/dto/TaxAgentAdjustRecordForFormSearchConditionDTO.java index 8d0b867ef..eae726c8c 100644 --- a/src/com/engine/salary/entity/taxagent/dto/TaxAgentAdjustRecordForFormSearchConditionDTO.java +++ b/src/com/engine/salary/entity/taxagent/dto/TaxAgentAdjustRecordForFormSearchConditionDTO.java @@ -46,7 +46,7 @@ // // @SalarySearchCondition( // label = "调整原因", -// labelId = 85431, +// labelId = 1897, // items = { // @SalarySearchConditionItem(itemType = WeaSearchConditionItemType.SELECT, name = "adjustReason", options = "getAdjustReasonOptions()"), // } @@ -55,7 +55,7 @@ // // @SalarySearchCondition( // label = "生效日期", -// labelId = 85904, +// labelId = 19548, // items = { // @SalarySearchConditionItem(itemType = WeaSearchConditionItemType.DATEPICKER, name = "effectiveTime") // } @@ -73,7 +73,7 @@ // // @SalarySearchCondition( // label = "操作人", -// labelId = 85435, +// labelId = 17482, // items = { // @SalarySearchConditionItem(itemType = WeaSearchConditionItemType.BROWSER, browserType = "resource", browserMultiple = true, name = "operator", browserModule = "hrmsalary") // } @@ -82,7 +82,7 @@ // // @SalarySearchCondition( // label = "备注", -// labelId = 84961, +// labelId = 536726, // items = { // @SalarySearchConditionItem(itemType = WeaSearchConditionItemType.INPUT, name = "description"), // } diff --git a/src/com/engine/salary/entity/taxagent/dto/TaxAgentAdjustRecordListDTO.java b/src/com/engine/salary/entity/taxagent/dto/TaxAgentAdjustRecordListDTO.java index bcec3993d..a5eca8372 100644 --- a/src/com/engine/salary/entity/taxagent/dto/TaxAgentAdjustRecordListDTO.java +++ b/src/com/engine/salary/entity/taxagent/dto/TaxAgentAdjustRecordListDTO.java @@ -66,7 +66,7 @@ // @ApiModelProperty("调整前") // @WeaFormat( // label = "调整前", -// labelId = 85433, +// labelId = 130510, // tableColumn = @TableColumn(width = "100") // ) // private String adjustBefore; @@ -74,7 +74,7 @@ // @ApiModelProperty("调整后") // @WeaFormat( // label = "调整后", -// labelId = 85434, +// labelId = 130511, // tableColumn = @TableColumn(width = "100") // ) // private String adjustAfter; @@ -82,7 +82,7 @@ // @ApiModelProperty("调整原因") // @WeaFormat( // label = "调整原因", -// labelId = 85431, +// labelId = 1897, // tableColumn = @TableColumn(width = "100") // ) // private String adjustReason; @@ -90,7 +90,7 @@ // @ApiModelProperty("生效日期") // @WeaFormat( // label = "生效日期", -// labelId = 85904, +// labelId = 19548, // tableColumn = @TableColumn(width = "100") // ) // @JsonFormat(pattern = "yyyy-MM-dd") @@ -99,7 +99,7 @@ // @ApiModelProperty("操作人") // @WeaFormat( // label = "操作人", -// labelId = 85435, +// labelId = 17482, // tableColumn = @TableColumn(width = "100") // ) // private String operator; @@ -107,7 +107,7 @@ // @ApiModelProperty("操作时间") // @WeaFormat( // label = "操作时间", -// labelId = 85436, +// labelId = 18008, // tableColumn = @TableColumn(width = "150") // ) // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -116,7 +116,7 @@ // @ApiModelProperty("备注") // @WeaFormat( // label = "备注", -// labelId = 84961, +// labelId = 536726, // tableColumn = @TableColumn(width = "100") // ) // private String description; diff --git a/src/com/engine/salary/entity/taxagent/dto/TaxAgentAdjustRecordSearchConditionDTO.java b/src/com/engine/salary/entity/taxagent/dto/TaxAgentAdjustRecordSearchConditionDTO.java index 1979334b6..a6b8d6649 100644 --- a/src/com/engine/salary/entity/taxagent/dto/TaxAgentAdjustRecordSearchConditionDTO.java +++ b/src/com/engine/salary/entity/taxagent/dto/TaxAgentAdjustRecordSearchConditionDTO.java @@ -52,7 +52,7 @@ // // @SalarySearchCondition( // label = "状态", -// labelId = 91075, +// labelId = 535101, // items = { // @SalarySearchConditionItem(itemType = WeaSearchConditionItemType.SELECT, name = "status", options = "getUserStatus()") // } @@ -86,7 +86,7 @@ // // @SalarySearchCondition( // label = "调整原因", -// labelId = 85431, +// labelId = 1897, // items = { // @SalarySearchConditionItem(itemType = WeaSearchConditionItemType.SELECT, name = "adjustReason", options = "getAdjustReasonOptions()"), // } @@ -95,7 +95,7 @@ // // @SalarySearchCondition( // label = "生效日期", -// labelId = 85904, +// labelId = 19548, // items = { // @SalarySearchConditionItem(itemType = WeaSearchConditionItemType.DATEPICKER, name = "effectiveTime") // } @@ -113,7 +113,7 @@ // // @SalarySearchCondition( // label = "操作人", -// labelId = 85435, +// labelId = 17482, // items = { // @SalarySearchConditionItem(itemType = WeaSearchConditionItemType.BROWSER, browserType = "resource", browserMultiple = true, name = "operator", browserModule = "hrmsalary") // } @@ -122,7 +122,7 @@ // // @SalarySearchCondition( // label = "备注", -// labelId = 84961, +// labelId = 536726, // items = { // @SalarySearchConditionItem(itemType = WeaSearchConditionItemType.INPUT, name = "description"), // } diff --git a/src/com/engine/salary/entity/taxagent/dto/TaxAgentListDTO.java b/src/com/engine/salary/entity/taxagent/dto/TaxAgentListDTO.java index 78b35c633..73f41b36e 100644 --- a/src/com/engine/salary/entity/taxagent/dto/TaxAgentListDTO.java +++ b/src/com/engine/salary/entity/taxagent/dto/TaxAgentListDTO.java @@ -35,7 +35,7 @@ public class TaxAgentListDTO { // @WeaFormat( // label = "备注", -// labelId = 84961, +// labelId = 536726, // tableColumn = @TableColumn(width = "40%") // ) private String description; diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java index 3cf749498..1368982a1 100644 --- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java +++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java @@ -94,7 +94,7 @@ public class TaxDeclarationBO { dto.setSeq(++index); dto.setEmployeeId(simpleEmployee.getEmployeeId()); dto.setEmployeeName(simpleEmployee.getUsername()); - dto.setIdCardType(SalaryI18nUtil.getI18nLabel(101696, "身份证")); + dto.setIdCardType(SalaryI18nUtil.getI18nLabel(23792, "身份证")); dto.setIdCardNo(""); dto.setTaxpayerIdNo(""); dto.setResidentType(SalaryI18nUtil.getI18nLabel(101697, "居民")); diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailBO.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailBO.java index 81010fb7b..f706e2ca0 100644 --- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailBO.java +++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailBO.java @@ -47,7 +47,7 @@ public class TaxDeclarationDetailBO { Map fieldCodeKeyFieldValueMap = SalaryEntityUtil.convert2Map(employeeIdKeyTaxDeclarationDetailPOMap.get(dto.getEmployeeType() + "_" + dto.getEmployeeId()), TaxDeclarationDetailPO::getFieldCode, TaxDeclarationDetailPO::getFieldValue); TaxDeclarationWageListDTO taxDeclarationWageListDTO = TaxDeclarationWageListDTO.builder() - .cardType(SalaryI18nUtil.getI18nLabel(105564, "居民身份证")) + .cardType(SalaryI18nUtil.getI18nLabel(503178, "居民身份证")) .income(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.INCOME)) .taxFreeIncome(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.TAX_FREE_INCOME)) .endowmentInsurance(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.ENDOWMENT_INSURANCE)) @@ -112,7 +112,7 @@ public class TaxDeclarationDetailBO { TaxDeclarationLaborListDTO taxDeclarationLaborListDTO = new TaxDeclarationLaborListDTO() .setId(dto.getEmployeeId()) .setEmployeeId(dto.getEmployeeId()) - .setCardType(SalaryI18nUtil.getI18nLabel(105564, "居民身份证")) + .setCardType(SalaryI18nUtil.getI18nLabel(503178, "居民身份证")) .setIncomeItems(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.INCOME_ITEMS)) .setLaborIncome(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.LABOR_INCOME)) .setLaborTaxFreeIncome(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.LABOR_TAX_FREE_INCOME)) @@ -158,7 +158,7 @@ public class TaxDeclarationDetailBO { TaxDeclarationAnnualListDTO taxDeclarationLaborListDTO = new TaxDeclarationAnnualListDTO() .setId(dto.getEmployeeId()) .setEmployeeId(dto.getEmployeeId()) - .setCardType(SalaryI18nUtil.getI18nLabel(105564, "居民身份证")) + .setCardType(SalaryI18nUtil.getI18nLabel(503178, "居民身份证")) .setAnnualIncome(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.ANNUAL_INCOME)) .setAnnualTaxFreeIncome(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.ANNUAL_TAX_FREE_INCOME)) .setAnnualOther(fieldCodeKeyFieldValueMap.get(TaxDeclarationDataIndexConstant.ANNUAL_OTHER)) diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailListColumn.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailListColumn.java index d4ce23062..ba839fba5 100644 --- a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailListColumn.java +++ b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailListColumn.java @@ -805,7 +805,7 @@ public class TaxDeclarationDetailListColumn { SalaryI18nUtil.getI18nLabel(102782, "身份证件号码"), SalaryI18nUtil.getI18nLabel(102783, "纳税人识别号"), SalaryI18nUtil.getI18nLabel(102785, "是否为非居民个人"), - SalaryI18nUtil.getI18nLabel(102786, "收入所得项目"), + SalaryI18nUtil.getI18nLabel(542345, "收入所得项目"), SalaryI18nUtil.getI18nLabel(96689, "收入"), SalaryI18nUtil.getI18nLabel(102789, "费用"), SalaryI18nUtil.getI18nLabel(102790, "免税收入"), @@ -815,11 +815,11 @@ public class TaxDeclarationDetailListColumn { SalaryI18nUtil.getI18nLabel(102794, "失业保险费"), SalaryI18nUtil.getI18nLabel(102795, "住房公积金"), SalaryI18nUtil.getI18nLabel(102796, "年金"), - SalaryI18nUtil.getI18nLabel(91238, "商业健康保险"), - SalaryI18nUtil.getI18nLabel(91239, "税延养老保险"), + SalaryI18nUtil.getI18nLabel(542292, "商业健康保险"), + SalaryI18nUtil.getI18nLabel(542293, "税延养老保险"), SalaryI18nUtil.getI18nLabel(102797, "财产原值"), SalaryI18nUtil.getI18nLabel(102798, "允许扣除的税费"), - SalaryI18nUtil.getI18nLabel(102799, "其他"), + SalaryI18nUtil.getI18nLabel(25740, "其他"), SalaryI18nUtil.getI18nLabel(542230, "累计收入额"), SalaryI18nUtil.getI18nLabel(542231, "累计减除费用"), SalaryI18nUtil.getI18nLabel(102800, "累计专项扣除"), @@ -830,7 +830,7 @@ public class TaxDeclarationDetailListColumn { SalaryI18nUtil.getI18nLabel(102805, "继续教育"), SalaryI18nUtil.getI18nLabel(542235, "累计其他扣除"), SalaryI18nUtil.getI18nLabel(102806, "减按计税比例"), - SalaryI18nUtil.getI18nLabel(91240, "准予扣除的捐赠额"), + SalaryI18nUtil.getI18nLabel(542294, "准予扣除的捐赠额"), SalaryI18nUtil.getI18nLabel(96693, "应纳税所得额"), SalaryI18nUtil.getI18nLabel(102808, "税率/预扣率"), SalaryI18nUtil.getI18nLabel(84228, "速算扣除数"), @@ -838,7 +838,7 @@ public class TaxDeclarationDetailListColumn { SalaryI18nUtil.getI18nLabel(102810, "减免税额"), SalaryI18nUtil.getI18nLabel(102811, "已扣缴税额"), SalaryI18nUtil.getI18nLabel(102812, "应补（退）税额"), - SalaryI18nUtil.getI18nLabel(84961, "备注")}; + SalaryI18nUtil.getI18nLabel(536726, "备注")}; } /** diff --git a/src/com/engine/salary/enums/SalaryDataSourceEnum.java b/src/com/engine/salary/enums/SalaryDataSourceEnum.java index 6e6faa715..cfdb8bbbf 100644 --- a/src/com/engine/salary/enums/SalaryDataSourceEnum.java +++ b/src/com/engine/salary/enums/SalaryDataSourceEnum.java @@ -15,11 +15,11 @@ import java.util.Objects; **/ public enum SalaryDataSourceEnum implements BaseEnum { - INPUT_IMPORT(0, "输入/导入", 92004), + INPUT_IMPORT(0, SalaryI18nUtil.getI18nLabel(542339, "输入/导入"), 542339), CUSTOM_FORMULA(1, "自定义公式", 92001), - SALARY_ITEM(2, "薪资项目", 84960), + SALARY_ITEM(2, SalaryI18nUtil.getI18nLabel(542362, "薪资项目"), 542362), EMPLOYEE_INFO(3, "员工基本信息", 85366), - SALARY_ARCHIVES(4, "薪资档案", 85368), + SALARY_ARCHIVES(4, SalaryI18nUtil.getI18nLabel(538004, "薪资档案"), 538004), CUMULATIVE_SITUATION(5, "累计情况（工资、薪金）", 87521), SPE_ADDI_DEDUCTIONS(6, SalaryI18nUtil.getI18nLabel(538006, "累计专项附加扣除"), 538006), SOCIAL_SECURITY(7, "社保福利", 87522), diff --git a/src/com/engine/salary/enums/SalarySobStatusEnum.java b/src/com/engine/salary/enums/SalarySobStatusEnum.java index 31557f24f..2e204472d 100644 --- a/src/com/engine/salary/enums/SalarySobStatusEnum.java +++ b/src/com/engine/salary/enums/SalarySobStatusEnum.java @@ -1,6 +1,7 @@ package com.engine.salary.enums; +import com.engine.salary.util.SalaryI18nUtil; /** * @description: 薪资账套设置步骤状态 @@ -14,7 +15,7 @@ public enum SalarySobStatusEnum implements BaseEnum { START(0, "开始", 86123), BASIC_INFO(1, "基础信息", 86124), EMPLOYEE_SCOPE(2, "人员范围", 86125), - SALARY_ITEM(3, "薪资项目", 84960), + SALARY_ITEM(3, SalaryI18nUtil.getI18nLabel(542362, "薪资项目"), 542362), CHECK_RULE(4, "校验规则", 86126), END(99, "结束", 86127); diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java index 840dbbc06..9ed6c80f7 100644 --- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java @@ -20,7 +20,7 @@ public enum SalaryArchiveItemAdjustReasonEnum { SALARY_ADJUSTMENT("SALARY_ADJUSTMENT", "调薪", 85985), POSITION_OR_SALARY_ADJUSTMENT("POSITION_OR_SALARY_ADJUSTMENT", "调岗调薪", 85986), DIMISSION("DIMISSION", "离职", 85902), - OTHER("OTHER", "其他", 84500), + OTHER("OTHER", SalaryI18nUtil.getI18nLabel(25740, "其他"), 25740), INIT("INIT", "初始化", 85903); private String value; diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveTaxAgentAdjustReasonEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveTaxAgentAdjustReasonEnum.java index 126bfee59..fe3f37842 100644 --- a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveTaxAgentAdjustReasonEnum.java +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveTaxAgentAdjustReasonEnum.java @@ -19,7 +19,7 @@ public enum SalaryArchiveTaxAgentAdjustReasonEnum { CHANGE("CHANGE", "变更", 85900), ONBOARD("ONBOARD", "入职", 85901), DIMISSION("DIMISSION", "离职", 85902), - OTHER("OTHER", "其他", 84500), + OTHER("OTHER", SalaryI18nUtil.getI18nLabel(25740, "其他"), 25740), INIT("INIT", "初始化", 85903); private String value; diff --git a/src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java b/src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java index 96a7fc32f..b7e17e881 100644 --- a/src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java +++ b/src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java @@ -16,15 +16,15 @@ import java.util.Objects; **/ public enum SalaryFormulaReferenceEnum implements BaseEnum { - SALARY_ITEM("salaryItem", "薪资项目", 84960), + SALARY_ITEM("salaryItem", SalaryI18nUtil.getI18nLabel(542362, "薪资项目"), 542362), // SALARY_ITEM_OF_HISTORY("salaryItemOfHistory", "历史台账薪资项目", 85364), EMPLOYEE_INFO("employeeInfo", "员工基本信息", 85366), - SALARY_ARCHIVES("salaryArchives", "薪资档案", 85368), + SALARY_ARCHIVES("salaryArchives", SalaryI18nUtil.getI18nLabel(538004, "薪资档案"), 538004), ATTEND("attend", "考勤引用", 85367), ADD_UP_SITUATION("addUpSituation", "往期累计情况", 104412), ADD_UP_DEDUCTIONS("addUpDeductions", SalaryI18nUtil.getI18nLabel(538006, "累计专项附加扣除"), 538006), WELFARE("welfare", "社保福利", 87522), - OTHER_DEDUCTION("otherDeduction", "其他免税扣除", 93849), + OTHER_DEDUCTION("otherDeduction", SalaryI18nUtil.getI18nLabel(538007, "其他免税扣除"), 538007), ISSUED("ISSUED", "已发", 0),; ; private String value; diff --git a/src/com/engine/salary/enums/taxagent/TaxAgentEmpChangeModuleEnum.java b/src/com/engine/salary/enums/taxagent/TaxAgentEmpChangeModuleEnum.java index b1edea29d..819ca7674 100644 --- a/src/com/engine/salary/enums/taxagent/TaxAgentEmpChangeModuleEnum.java +++ b/src/com/engine/salary/enums/taxagent/TaxAgentEmpChangeModuleEnum.java @@ -1,5 +1,7 @@ package com.engine.salary.enums.taxagent; +import com.engine.salary.util.SalaryI18nUtil; + /** * 模块类型 *

Copyright: Copyright (c) 2022

@@ -10,7 +12,7 @@ package com.engine.salary.enums.taxagent; **/ public enum TaxAgentEmpChangeModuleEnum { - SALARY_ARCHIVE(1, "薪资档案"), + SALARY_ARCHIVE(1, SalaryI18nUtil.getI18nLabel(538004, "薪资档案")), INSURANCE_ARCHIVE(2, "社保档案"); private int value; diff --git a/src/com/engine/salary/enums/taxagent/TaxAgentRoleTypeEnum.java b/src/com/engine/salary/enums/taxagent/TaxAgentRoleTypeEnum.java index f5cde5746..f03435811 100644 --- a/src/com/engine/salary/enums/taxagent/TaxAgentRoleTypeEnum.java +++ b/src/com/engine/salary/enums/taxagent/TaxAgentRoleTypeEnum.java @@ -1,5 +1,7 @@ package com.engine.salary.enums.taxagent; +import com.engine.salary.util.SalaryI18nUtil; + /** * @Description: 个税扣缴义务人角色类型 * @Author: wangxiangzhong @@ -10,7 +12,7 @@ public enum TaxAgentRoleTypeEnum { CHIEF(0, "总管理员"), ADMIN(1, "管理员"), SUBADMIN(2, "分管理员"), - NONE(3, "其他"); + NONE(3, SalaryI18nUtil.getI18nLabel(25740, "其他")); private int value; diff --git a/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java b/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java index d21a749b3..c9bbce342 100644 --- a/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java +++ b/src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java @@ -270,17 +270,17 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic Map otherColumns = new HashMap<>(); socailIds.stream().forEach(social -> { if (categoryIdNameMap.containsKey(social)) { - socialColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 100289, "单位"), social + "socialCom"); + socialColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 1329, "单位"), social + "socialCom"); } }); fundIds.stream().forEach(social -> { if (categoryIdNameMap.containsKey(social)) { - fundColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 100289, "单位"), social + "fundCom"); + fundColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 1329, "单位"), social + "fundCom"); } }); otherIds.stream().forEach(social -> { if (categoryIdNameMap.containsKey(social)) { - otherColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 100289, "单位"), social + "otherCom"); + otherColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel( 1329, "单位"), social + "otherCom"); } }); result.put(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), socialColumns); @@ -312,7 +312,7 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "department")); list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(125238, "手机号"), "mobile")); list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(15890, "员工状态"), "employeeStatus")); - list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 100544, "缴纳情况"), "supplementaryMonth")); +// list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 542284, "缴纳情况"), "supplementaryMonth")); list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel( 542267, "社保方案名称"), "socialSchemeName")); //组装社保基数 columns.get(WelfareTypeEnum.SOCIAL_SECURITY.getValue()).forEach((k, v) -> { @@ -397,16 +397,16 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic public List buildCompensationColumns() { List list = new ArrayList<>(); - WeaTableColumn weaTableNameColumn = new WeaTableColumn("300px",SalaryI18nUtil.getI18nLabel( 87000, "调差对象"), "target"); + WeaTableColumn weaTableNameColumn = new WeaTableColumn("300px",SalaryI18nUtil.getI18nLabel( 542285, "调差对象"), "target"); weaTableNameColumn.setFixed("left"); list.add(weaTableNameColumn); - list.add(new WeaTableColumn("100px",SalaryI18nUtil.getI18nLabel( 87001, "统计调差福利"), "welfareType")); - list.add(new WeaTableColumn("200px",SalaryI18nUtil.getI18nLabel( 87001, "统计调差福利类型（单位）"), "categoryType")); - list.add(new WeaTableColumn("200px",SalaryI18nUtil.getI18nLabel( 87002, "国家核算金额（单位）"), "countryTotal")); - list.add(new WeaTableColumn("200px",SalaryI18nUtil.getI18nLabel( 87003, "公司核算金额（单位）"), "companyTotal")); - list.add(new WeaTableColumn("100px",SalaryI18nUtil.getI18nLabel( 87004, "应调差金额"), "adjustmentTotal")); - list.add(new WeaTableColumn("200px",SalaryI18nUtil.getI18nLabel( 87005, "调差到（单位）"), "adjustTo")); + list.add(new WeaTableColumn("100px",SalaryI18nUtil.getI18nLabel( 542286, "统计调差福利"), "welfareType")); + list.add(new WeaTableColumn("200px",SalaryI18nUtil.getI18nLabel( 542287, "统计调差福利类型（单位）"), "categoryType")); + list.add(new WeaTableColumn("200px",SalaryI18nUtil.getI18nLabel( 542288, "国家核算金额（单位）"), "countryTotal")); + list.add(new WeaTableColumn("200px",SalaryI18nUtil.getI18nLabel( 542289, "公司核算金额（单位）"), "companyTotal")); + list.add(new WeaTableColumn("100px",SalaryI18nUtil.getI18nLabel( 542290, "应调差金额"), "adjustmentTotal")); + list.add(new WeaTableColumn("200px",SalaryI18nUtil.getI18nLabel( 542291, "调差到（单位）"), "adjustTo")); return list; diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java index 25ebca4bc..4917a41e7 100644 --- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java @@ -402,7 +402,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction List> rowList = getExcelRowList(param); //获取excel - return ExcelUtil.genWorkbook(rowList, "其他免税扣除"); + return ExcelUtil.genWorkbook(rowList, SalaryI18nUtil.getI18nLabel(538007, "其他免税扣除")); } @@ -421,11 +421,11 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), SalaryI18nUtil.getI18nLabel(1839, "证件号码"), SalaryI18nUtil.getI18nLabel(1516, "入职日期"), - "商业健康保险", - "税延养老保险", - "其他", - "准予扣除的捐赠额", - "个人养老金"); + SalaryI18nUtil.getI18nLabel(542292, "商业健康保险"), + SalaryI18nUtil.getI18nLabel(542293, "税延养老保险"), + SalaryI18nUtil.getI18nLabel(25740, "其他"), + SalaryI18nUtil.getI18nLabel(542294, "准予扣除的捐赠额"), + SalaryI18nUtil.getI18nLabel(542295, "个人养老金")); //排序配置 OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); param.setOrderRule(orderRule); @@ -516,7 +516,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction List> rowList = getExcelRowDetailList(param); //获取excel - return ExcelUtil.genWorkbook(rowList, "其他免税扣除明细"); + return ExcelUtil.genWorkbook(rowList, SalaryI18nUtil.getI18nLabel(542296,"其他免税扣除明细")); } @@ -534,11 +534,11 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), SalaryI18nUtil.getI18nLabel(125238, "手机号"), SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), - "商业健康保险", - "税延养老保险", - "其他", - "准予扣除的捐赠额", - "个人养老金"); + SalaryI18nUtil.getI18nLabel(542292, "商业健康保险"), + SalaryI18nUtil.getI18nLabel(542293, "税延养老保险"), + SalaryI18nUtil.getI18nLabel(25740, "其他"), + SalaryI18nUtil.getI18nLabel(542294, "准予扣除的捐赠额"), + SalaryI18nUtil.getI18nLabel(542295, "个人养老金")); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM"); //查询详细信息 @@ -573,7 +573,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction @Override public List getOtherDeductionList(YearMonth declareMonth, List employeeIds, Long taxAgentId) { if (declareMonth == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100342, "参数有误：申报月份必传")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542297, "参数有误：申报月份必传")); } OtherDeductionBiz OtherDeductionBiz = new OtherDeductionBiz(); return OtherDeductionBiz.listSome(OtherDeductionPO.builder().declareMonth(SalaryDateUtil.toDateStartOfMonth(declareMonth)).employeeIds(employeeIds).taxAgentId(taxAgentId).build()); @@ -875,7 +875,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction @Override public XSSFWorkbook downloadTemplate(OtherDeductionQueryParam param) { // 1.工作簿名称 - String sheetName = SalaryI18nUtil.getI18nLabel(101604, "其他免税扣除导入模板"); + String sheetName = SalaryI18nUtil.getI18nLabel(542298, "其他免税扣除导入模板"); String[] header = { SalaryI18nUtil.getI18nLabel(25034, "姓名"), SalaryI18nUtil.getI18nLabel(537996, "个税扣缴义务人"), @@ -884,10 +884,10 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), SalaryI18nUtil.getI18nLabel(1839, "证件号码"), SalaryI18nUtil.getI18nLabel(1516, "入职日期"), - SalaryI18nUtil.getI18nLabel(91238, "商业健康保险"), - SalaryI18nUtil.getI18nLabel(91239, "税延养老保险"), - SalaryI18nUtil.getI18nLabel(84500, "其他"), - SalaryI18nUtil.getI18nLabel(91240, "准予扣除的捐赠额") + SalaryI18nUtil.getI18nLabel(542292, "商业健康保险"), + SalaryI18nUtil.getI18nLabel(542293, "税延养老保险"), + SalaryI18nUtil.getI18nLabel(25740, "其他"), + SalaryI18nUtil.getI18nLabel(542294, "准予扣除的捐赠额") }; // 2.表头 List> rows = new ArrayList<>(); diff --git a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java index d6cc2e8f9..43c20d9f4 100644 --- a/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java +++ b/src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java @@ -68,7 +68,7 @@ public class RecordsBuildServiceImpl extends Service implements RecordsBuildServ } List paymentList = getTaxAgentMapper().listAll(); - SalaryAssert.notEmpty(paymentList, SalaryI18nUtil.getI18nLabel(100341, "暂无扣缴义务人")); + SalaryAssert.notEmpty(paymentList, SalaryI18nUtil.getI18nLabel(542299, "暂无扣缴义务人")); Map paymentMap = paymentList.stream().collect(Collectors.toMap(TaxAgentPO::getId, Function.identity())); Map collect = employeeByIds.stream().collect(Collectors.toMap(DataCollectionEmployee::getEmployeeId, Function.identity())); list.forEach(item -> { diff --git a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java index c2e813437..f49f5a154 100644 --- a/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java @@ -19,6 +19,7 @@ import com.engine.salary.service.SIAComparisonResultService; import com.engine.salary.sys.entity.vo.OrderRuleVO; import com.engine.salary.sys.service.SalarySysConfService; import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl; +import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelUtil; import com.engine.salary.util.page.Column; @@ -91,8 +92,8 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar } // 薪资项目的表头 if (welfareInfo.contains(weaTableColumn.getKey())) { - headerList.add(weaTableColumn.getTitle() + " (线上值)"); - headerList.add(weaTableColumn.getTitle() + " (线下值)"); + headerList.add(weaTableColumn.getTitle() + SalaryI18nUtil.getI18nLabel(542313, " (线上值)")); + headerList.add(weaTableColumn.getTitle() + SalaryI18nUtil.getI18nLabel(542314, " (线下值)")); } } @@ -117,7 +118,7 @@ public class SIAComparisonResultServiceImpl extends Service implements SIACompar rows.add(row); } - String sheetName = "线下对比结果"; + String sheetName = SalaryI18nUtil.getI18nLabel(542315, "线下对比结果"); return ExcelUtil.genWorkbookV2(rows, sheetName); } diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 188408301..a39c978ec 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -511,7 +511,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { datePickerItem.getOtherParams().put("showFormat", "YYYY-MM"); conditionItems.add(datePickerItem); - SearchConditionItem textareaItem = SalaryFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "备注", "remarks"); + SearchConditionItem textareaItem = SalaryFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, SalaryI18nUtil.getI18nLabel(536726, "备注"), "remarks"); conditionItems.add(textareaItem); addGroups.add(new SearchConditionGroup(SalaryI18nUtil.getI18nLabel(user.getLanguage(),32905,"常用条件"), true, conditionItems)); @@ -946,13 +946,13 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { result.put(SalaryI18nUtil.getI18nLabel(542278, "其他福利单位合计"), "otherComSum"); list.stream().forEach(item -> { if (Objects.equals(WelfareTypeEnum.SOCIAL_SECURITY.getValue(), item.getWelfareType())) { - result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), item.getId() + "socialCom"); + result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(1329, "单位"), item.getId() + "socialCom"); } if (Objects.equals(WelfareTypeEnum.ACCUMULATION_FUND.getValue(), item.getWelfareType())) { - result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), item.getId() + "fundCom"); + result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(1329, "单位"), item.getId() + "fundCom"); } if (Objects.equals(WelfareTypeEnum.OTHER.getValue(), item.getWelfareType())) { - result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(100289, "单位"), item.getId() + "otherCom"); + result.put(categoryIdNameMap.get(String.valueOf(item.getId())) + SalaryI18nUtil.getI18nLabel(1329, "单位"), item.getId() + "otherCom"); } }); return result; @@ -1280,10 +1280,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { // 处理数值 List> data = ExcelParseHelper.parse2Map(sheet, 1); if (CollectionUtils.isEmpty(headers)) { - throw new SalaryRunTimeException("表头为空"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542317,"表头为空")); } if (CollectionUtils.isEmpty(data)) { - throw new SalaryRunTimeException("无数据"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(508873,"无数据")); } //存储待更新的InsuranceAccountDetailPO数据 List updateInsuranceAccountDetailList = new ArrayList<>(); @@ -1311,7 +1311,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } else { isError = true; Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(100579, SalaryI18nUtil.getI18nLabel(102840, "个税扣缴义务人错误，系统内不存在该个税扣缴义务人"))); + errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(542318, "个税扣缴义务人错误，系统内不存在该个税扣缴义务人")); excelComments.add(errorMessageMap); } @@ -1443,7 +1443,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { //1、参数校验 String imageId = param.getImageId(); if (StringUtils.isBlank(imageId)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100593, "文件id为空")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542369, "文件id为空")); } Map map = new HashMap<>(); @@ -1617,7 +1617,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { String keyName = entry.getKey(); //获取元素名后缀，方便之后判断“个人”或“单位” String per = SalaryI18nUtil.getI18nLabel(500201, "个人"); - String com = SalaryI18nUtil.getI18nLabel(500201, "单位"); + String com = SalaryI18nUtil.getI18nLabel(1329, "单位"); int maxLen = Math.max(per.length(), com.length()); int minLen = Math.min(per.length(), com.length()); String payScope = ""; @@ -1648,7 +1648,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { targetSubLen = SalaryI18nUtil.getI18nLabel(500201, "个人").length(); targetWelfareName = entry.getKey().substring(0, keyName.length() - targetSubLen); } else if (payScope.equals(com)){ - targetSubLen = SalaryI18nUtil.getI18nLabel( 542283, "单位").length(); + targetSubLen = SalaryI18nUtil.getI18nLabel( 1329, "单位").length(); targetWelfareName = entry.getKey().substring(0, keyName.length() - targetSubLen); } List categoryPOList = siCategoryBiz.listByName(targetWelfareName); @@ -1670,7 +1670,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { default: throw new SalaryRunTimeException("福利类型不存在"); } - } else if ("单位".equals(payScope)) { + } else if (SalaryI18nUtil.getI18nLabel(1329, "单位").equals(payScope)) { switch (welfareType) { case 1: socialComMap.put(iCategoryPO.getId().toString(), entry.getValue().toString()); @@ -1910,17 +1910,17 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { headerList.add(SalaryI18nUtil.getI18nLabel(542275, "个人合计")); //社保单位（生育保险单位、工伤保险单位、失业保险单位、养老保险单位、医疗保险单位） for (ICategoryPO po : socialWelfareList) { - headerList.add(po.getInsuranceName() + "单位"); + headerList.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(1329, "单位")); } headerList.add(SalaryI18nUtil.getI18nLabel(542276, "社保单位合计")); //住房公积金单位、补充住房公积金单位 for (ICategoryPO po : fundWelfareList) { - headerList.add(po.getInsuranceName() + "单位"); + headerList.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(1329, "单位")); } headerList.add(SalaryI18nUtil.getI18nLabel(542277, "公积金单位合计")); //其他单位（比如企业年金单位） for (ICategoryPO po : otherWelfareList) { - headerList.add(po.getInsuranceName() + "单位"); + headerList.add(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(1329, "单位")); } headerList.add(SalaryI18nUtil.getI18nLabel(542278, "其他福利单位合计")); headerList.add(SalaryI18nUtil.getI18nLabel(542279, "单位合计")); @@ -1978,10 +1978,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { // 处理数值 List> data = ExcelParseHelper.parse2Map(sheet, 1); if (CollectionUtils.isEmpty(headers)) { - throw new SalaryRunTimeException("表头为空"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542317,"表头为空")); } if (CollectionUtils.isEmpty(data)) { - throw new SalaryRunTimeException("无数据"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(508873,"无数据")); } String billMonth = importParam.getBillMonth(); @@ -2010,7 +2010,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } else { isError = true; Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(100579, SalaryI18nUtil.getI18nLabel(102840, "个税扣缴义务人错误，系统内不存在该个税扣缴义务人"))); + errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(542318, "个税扣缴义务人错误，系统内不存在该个税扣缴义务人")); excelComments.add(errorMessageMap); } @@ -2149,7 +2149,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { String keyName = entry.getKey(); //获取元素名后缀，方便之后判断“个人”或“单位”或者“基数” String per = SalaryI18nUtil.getI18nLabel(500201, "个人"); - String com = SalaryI18nUtil.getI18nLabel(500201, "单位"); + String com = SalaryI18nUtil.getI18nLabel(1329, "单位"); String base = SalaryI18nUtil.getI18nLabel(500201, "基数"); int maxLen = Math.max(per.length(), Math.max(com.length(), base.length())); int minLen = Math.min(per.length(), Math.min(com.length(), base.length())); @@ -2191,7 +2191,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { targetSubLen = SalaryI18nUtil.getI18nLabel(500201, "个人").length(); targetWelfareName = entry.getKey().substring(0, keyName.length() - targetSubLen); } else if (payScope.equals(com)){ - targetSubLen = SalaryI18nUtil.getI18nLabel( 542283, "单位").length(); + targetSubLen = SalaryI18nUtil.getI18nLabel( 1329, "单位").length(); targetWelfareName = entry.getKey().substring(0, keyName.length() - targetSubLen); } List categoryPOList = siCategoryBiz.listByName(targetWelfareName); @@ -2753,10 +2753,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { // 处理数值 List> data = ExcelParseHelper.parse2Map(sheet, 1); if (CollectionUtils.isEmpty(headers)) { - throw new SalaryRunTimeException("表头为空"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542317,"表头为空")); } if (CollectionUtils.isEmpty(data)) { - throw new SalaryRunTimeException("无数据"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(508873,"无数据")); } //存储待更新的InsuranceAccountDetailPO数据 List updateInsuranceAccountDetailList = new ArrayList<>(); @@ -2789,7 +2789,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { } else { isError = true; Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(100579, SalaryI18nUtil.getI18nLabel(102840, "个税扣缴义务人错误，系统内不存在该个税扣缴义务人"))); + errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(542318, "个税扣缴义务人错误，系统内不存在该个税扣缴义务人")); excelComments.add(errorMessageMap); } @@ -3227,10 +3227,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { for (int i = 0; i < singleAccount.size(); i++) { Map stringObjectMap = singleAccount.get(i); Optional personalOptional = socialCategory.stream() - .filter(social -> stringObjectMap.containsKey(social.getInsuranceName() + SalaryI18nUtil.getI18nLabel(100289, "单位"))).findFirst(); + .filter(social -> stringObjectMap.containsKey(social.getInsuranceName() + SalaryI18nUtil.getI18nLabel(1329, "单位"))).findFirst(); if (personalOptional.isPresent() && StringUtils - .isNotBlank((String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(100289, "单位")))) { - String perNumString = (String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(100289, "单位")); + .isNotBlank((String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(1329, "单位")))) { + String perNumString = (String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(1329, "单位")); if (perNumString.length() > 0 && !isNumeric(perNumString)) { continue; @@ -3286,10 +3286,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { for (int i = 0; i < singleAccount.size(); i++) { Map stringObjectMap = singleAccount.get(i); Optional personalOptional = fundCategory.stream() - .filter(social -> stringObjectMap.containsKey(social.getInsuranceName() + SalaryI18nUtil.getI18nLabel(100289, "单位"))).findFirst(); + .filter(social -> stringObjectMap.containsKey(social.getInsuranceName() + SalaryI18nUtil.getI18nLabel(1329, "单位"))).findFirst(); if (personalOptional.isPresent() && StringUtils - .isNotBlank((String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(100289, "单位")))) { - String perNumString = (String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(100289, "单位")); + .isNotBlank((String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(1329, "单位")))) { + String perNumString = (String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(1329, "单位")); if (perNumString.length() > 0 && !isNumeric(perNumString)) { continue; } @@ -3344,10 +3344,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { for (int i = 0; i < singleAccount.size(); i++) { Map stringObjectMap = singleAccount.get(i); Optional personalOptional = otherCategory.stream() - .filter(social -> stringObjectMap.containsKey(social.getInsuranceName() + SalaryI18nUtil.getI18nLabel(100289, "单位"))).findFirst(); + .filter(social -> stringObjectMap.containsKey(social.getInsuranceName() + SalaryI18nUtil.getI18nLabel(1329, "单位"))).findFirst(); if (personalOptional.isPresent() && StringUtils - .isNotBlank((String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(100289, "单位")))) { - String perNumString = (String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(100289, "单位")); + .isNotBlank((String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(1329, "单位")))) { + String perNumString = (String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(1329, "单位")); if (perNumString.length() > 0 && !isNumeric(perNumString)) { continue; } diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index 86b10d431..c44480cf0 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -610,7 +610,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService @Override public void cancelStopPayment(Collection ids) { if (CollectionUtils.isEmpty(ids)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542372, "没有可以操作的记录")); } List pos = getInsuranceBaseInfoMapper().listByIds(ids); @@ -656,7 +656,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService public Map stayDelToStop(Collection ids) { if (CollectionUtils.isEmpty(ids)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542372, "没有可以操作的记录")); } List baseInfoPOList = getInsuranceBaseInfoMapper().listByIds(ids); @@ -729,7 +729,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService } Map resultMap = new HashMap<>(2); - String resultMsg = "操作成功"; + String resultMsg = SalaryI18nUtil.getI18nLabel(30700, "操作成功"); String resultType = "success"; // 批量设为定薪提示 @@ -792,10 +792,10 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (stayDelIds.size() > 0) { return stayDelToStop(stayDelIds); } else { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542372, "没有可以操作的记录")); } } else { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542372, "没有可以操作的记录")); } } @@ -805,7 +805,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService @Override public Map stayAddToPay(Collection ids) { if (CollectionUtils.isEmpty(ids)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542372, "没有可以操作的记录")); } // List baseInfoPOList = new ArrayList<>(); @@ -920,7 +920,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService } Map resultMap = new HashMap<>(2); - String resultMsg = "操作成功"; + String resultMsg = SalaryI18nUtil.getI18nLabel(30700, "操作成功"); String resultType = "success"; // 批量设为定薪提示 @@ -981,10 +981,10 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (stayAddIds.size() > 0) { return stayAddToPay(stayAddIds); } else { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542372, "没有可以操作的记录")); } } else { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542372, "没有可以操作的记录")); } } diff --git a/src/com/engine/salary/service/impl/SIExportServiceImpl.java b/src/com/engine/salary/service/impl/SIExportServiceImpl.java index ea13633ba..8f0fd68b5 100644 --- a/src/com/engine/salary/service/impl/SIExportServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIExportServiceImpl.java @@ -376,19 +376,19 @@ public class SIExportServiceImpl extends Service implements SIExportService { socailIds.stream().forEach(social -> { if (categoryIdNameMap.containsKey(social)) { socialColumns.put( - categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(100289, "单位"), + categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(1329, "单位"), social + "socialCom"); } }); fundIds.stream().forEach(social -> { if (categoryIdNameMap.containsKey(social)) { - fundColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(100289, "单位"), + fundColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(1329, "单位"), social + "fundCom"); } }); otherIds.stream().forEach(social -> { if (categoryIdNameMap.containsKey(social)) { - otherColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(100289, "单位"), + otherColumns.put(categoryIdNameMap.get(social) + SalaryI18nUtil.getI18nLabel(1329, "单位"), social + "otherCom"); } }); diff --git a/src/com/engine/salary/service/impl/SalaryAcctCalcServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctCalcServiceImpl.java index c48450772..c9825e02e 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctCalcServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctCalcServiceImpl.java @@ -295,7 +295,7 @@ // // private void checkBeforeCalc(SalaryAcctRecordPO salaryAcctRecordPO, List salaryAcctEmployees) { // if (Objects.isNull(salaryAcctRecordPO)) { -// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145221, "薪资核算记录不存在或已被删除")); +// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); // } // // 归档状态或已申报状态下不能核算 // if (!Objects.equals(salaryAcctRecordPO.getStatus(), SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue())) { diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java index 0016a4526..f0140c674 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java @@ -136,12 +136,12 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(addParam.getSalaryAcctRecordId()); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 查询环比减少的薪资核算人员 List salaryAcctEmployeePOS = listByIds(addParam.getIds()); if (CollectionUtils.isEmpty(salaryAcctEmployeePOS)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98830, "薪资核算人员不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542301, "薪资核算人员不存在或已被删除")); } // 添加薪资核算人员 Date now = new Date(); @@ -349,19 +349,19 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(saveParam.getSalaryAcctRecordId()); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 查询薪资核算人员 List existSalaryAcctEmployeePOS = listBySalaryAcctRecordIdAndEmployeeIds(saveParam.getSalaryAcctRecordId(), saveParam.getEmployeeIds()); if (CollectionUtils.isNotEmpty(existSalaryAcctEmployeePOS)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(101581, "人员已存在，请勿重复添加")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542302, "人员已存在，请勿重复添加")); } // 根据薪资账套查询薪资周期 SalarySobCycleDTO salarySobCycleDTO = getSalarySobService(user).getSalarySobCycle(salaryAcctRecordPO.getSalarySobId(), SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth())); //获取核算的扣缴义务人 SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId()); if (Objects.isNull(salarySobPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98769, "薪资账套不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542303, "薪资账套不存在或已被删除")); } Long taxAgentId = salarySobPO.getTaxAgentId(); @@ -375,7 +375,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct salaryAcctEmployeePOS = salaryAcctEmployeePOS.stream().filter(ps -> Objects.equals(taxAgentId, ps.getTaxAgentId())).collect(Collectors.toList()); // 保存薪资核算人员 if (CollectionUtils.isEmpty(salaryAcctEmployeePOS)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98769, "个税扣缴义务人下无该人员档案信息或薪资缴纳日期不在薪资周期内")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542304, "个税扣缴义务人下无该人员档案信息或薪资缴纳日期不在薪资周期内")); } batchSave(salaryAcctEmployeePOS); @@ -422,20 +422,20 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(deleteParam.getSalaryAcctRecordId()); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 回算不允许删除薪资核算人员 if (Objects.equals(salaryAcctRecordPO.getBackCalcStatus() , 1)){ - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"正常薪资已经发放，薪资回算时，不允许再删除薪资核算人员")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542305,"正常薪资已经发放，薪资回算时，不允许再删除薪资核算人员")); } // 只有未归档时才能删除薪资核算人员 if (!Objects.equals(salaryAcctRecordPO.getStatus(), SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98830, "薪资核算已归档或已申报，不允许再删除薪资核算人员")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542306, "薪资核算已归档或已申报，不允许再删除薪资核算人员")); } // 查询薪资核算人员 List salaryAcctEmployeePOS = listBySalaryAcctRecordIdAndIds(deleteParam.getSalaryAcctRecordId(), deleteParam.getIds()); if (CollectionUtils.isEmpty(salaryAcctEmployeePOS)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98830, "薪资核算人员不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542301, "薪资核算人员不存在或已被删除")); } // 删除薪资核算人员 Set ids = SalaryEntityUtil.properties(salaryAcctEmployeePOS, SalaryAcctEmployeePO::getId); @@ -444,7 +444,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct // 查询薪资账套（记录日志用） SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId()); if (Objects.isNull(salarySobPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98769, "薪资账套不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542303, "薪资账套不存在或已被删除")); } // 记录日志 // String targetName = salarySobPO.getName() + ":" + SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()); @@ -514,7 +514,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(salaryAcctRecordId); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } //查询账套对应的扣缴义务人 SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId()); diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index d06f22ece..73df99fbe 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -141,7 +141,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc ValidUtil.doValidator(queryParam); // 1.工作簿名称 - String sheetName = SalaryI18nUtil.getI18nLabel(85368, "核算人员范围"); + String sheetName = SalaryI18nUtil.getI18nLabel(542307, "核算人员范围"); // 2.表头 String[] header = { SalaryI18nUtil.getI18nLabel(25034, "姓名"), @@ -151,7 +151,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), SalaryI18nUtil.getI18nLabel(15890, "员工状态"), SalaryI18nUtil.getI18nLabel(1516, "入职日期"), - SalaryI18nUtil.getI18nLabel(91075, "离职日期") + SalaryI18nUtil.getI18nLabel(15961, "离职日期") }; List headerList = new ArrayList<>(Arrays.asList(header)); // 查询薪资核算人员 @@ -174,7 +174,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc ValidUtil.doValidator(queryParam); // 1.工作簿名称 - String sheetName = SalaryI18nUtil.getI18nLabel(85368, "环比上月减少人员"); + String sheetName = SalaryI18nUtil.getI18nLabel(542308, "环比上月减少人员"); // 2.表头 String[] header = { SalaryI18nUtil.getI18nLabel(25034, "姓名"), @@ -184,7 +184,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), SalaryI18nUtil.getI18nLabel(15890, "员工状态"), SalaryI18nUtil.getI18nLabel(1516, "入职日期"), - SalaryI18nUtil.getI18nLabel(91075, "离职日期") + SalaryI18nUtil.getI18nLabel(15961, "离职日期") }; List headerList = new ArrayList<>(Arrays.asList(header)); // 查询薪资核算人员（环比上月减少） @@ -206,7 +206,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc ValidUtil.doValidator(queryParam); // 1.工作簿名称 - String sheetName = SalaryI18nUtil.getI18nLabel(85368, "环比上月增加人员"); + String sheetName = SalaryI18nUtil.getI18nLabel(542309, "环比上月增加人员"); // 2.表头 String[] header = { SalaryI18nUtil.getI18nLabel(25034, "姓名"), @@ -216,7 +216,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), SalaryI18nUtil.getI18nLabel(15890, "员工状态"), SalaryI18nUtil.getI18nLabel(1516, "入职日期"), - SalaryI18nUtil.getI18nLabel(91075, "离职日期") + SalaryI18nUtil.getI18nLabel(15961, "离职日期") }; List headerList = new ArrayList<>(Arrays.asList(header)); // 查询薪资核算人员（环比上月增加） @@ -272,7 +272,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(queryParam.getSalaryAcctRecordId()); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // excel导出的表头 List headerColumnGroup = Lists.newArrayList(); @@ -296,7 +296,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc total = true; Map sumRow = getSalaryAcctResultService(user).sumRow(queryParam); if(sumRow !=null){ - sumRow.put("taxAgentName", "总计"); + sumRow.put("taxAgentName", SalaryI18nUtil.getI18nLabel(523, "总计")); resultMapList.add(sumRow); } } @@ -312,7 +312,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc rows.add(row); } - String sheetName = "薪资核算结果"; + String sheetName = SalaryI18nUtil.getI18nLabel(542310, "薪资核算结果"); // return ExcelUtil.genWorkbookV2(rows, sheetName, total); return ExcelUtilPlus.genWorkbookWithChildTitleColumn(rows, sheetName, total); } @@ -368,7 +368,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(salaryAcctRecordId); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 查询薪资核算记录所用的薪资账套的薪资项目副本 List salarySobItems = getSalarySobItemService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId()); @@ -413,12 +413,12 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc // 必须选择导入模板所需的薪资项目 if (CollectionUtils.isEmpty(param.getSalaryItemIds())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(99019, "参数错误，请选择导入模板所需的薪资项目")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542311, "参数错误，请选择导入模板所需的薪资项目")); } // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(param.getSalaryAcctRecordId()); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // // 模板表头(默认必带"个税扣缴义务人"、"姓名") // List headerList = Lists.newArrayList(SalaryI18nUtil.getI18nLabel(25034, "姓名"), @@ -494,7 +494,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc rows.add(row); } - String sheetName = "薪资核算导入模板"; + String sheetName = SalaryI18nUtil.getI18nLabel(542312, "薪资核算导入模板"); return ExcelUtilPlus.genWorkbookWithChildTitleColumn(rows, sheetName, false); } @@ -507,7 +507,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(queryParam.getSalaryAcctRecordId()); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 查询线下对比结果 SalaryComparisonResultListDTO salaryComparisonResultListDTO = getSalaryComparisonResultService(user).listByParam(queryParam); @@ -526,8 +526,8 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc } // 薪资项目的表头 if (salaryItemIds.contains(weaTableColumn.getKey())) { - headerList.add(weaTableColumn.getTitle() + " (线上值)"); - headerList.add(weaTableColumn.getTitle() + " (线下值)"); + headerList.add(weaTableColumn.getTitle() + SalaryI18nUtil.getI18nLabel(542313, " (线上值)")); + headerList.add(weaTableColumn.getTitle() + SalaryI18nUtil.getI18nLabel(542314, " (线下值)")); } } @@ -552,7 +552,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc rows.add(row); } - String sheetName = "线下对比结果"; + String sheetName = SalaryI18nUtil.getI18nLabel(542315, "线下对比结果"); // return ExcelUtil.genWorkbookV2(rows, sheetName); return ExcelUtilPlus.genWorkbookV2(rows, sheetName); @@ -567,7 +567,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(exportParam.getSalaryAcctRecordId()); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 模板表头(默认必带"个税扣缴义务人"、"姓名") List headerList = Lists.newArrayList(SalaryI18nUtil.getI18nLabel(25034, "姓名"), SalaryI18nUtil.getI18nLabel(537996, "个税扣缴义务人")); @@ -601,7 +601,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc } List> rows = new ArrayList<>(); rows.add(headerList); - String sheetName = "线下对比结果导入模板"; + String sheetName = SalaryI18nUtil.getI18nLabel(542316, "线下对比结果导入模板"); // return ExcelUtil.genWorkbookV2(rows, sheetName); return ExcelUtilPlus.genWorkbookV2(rows, sheetName); @@ -680,7 +680,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc // 薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(salaryAcctRecordId); if (salaryAcctRecordPO == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 薪资账套下的薪资项目副本 List salarySobItemPOS = getSalarySobItemService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId()); @@ -755,10 +755,10 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc } if (CollectionUtils.isEmpty(headers)) { - throw new RuntimeException("表头为空"); + throw new RuntimeException(SalaryI18nUtil.getI18nLabel(542317,"表头为空")); } if (CollectionUtils.isEmpty(data)) { - throw new RuntimeException("无数据"); + throw new RuntimeException(SalaryI18nUtil.getI18nLabel(508873,"无数据")); } for (int i = 0; i < data.size(); i++) { @@ -835,9 +835,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc if (taxAgentId == null || taxAgentId <= 0) { isError = true; Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(100579, SalaryI18nUtil.getI18nLabel(102840, "个税扣缴义务人错误，系统内不存在该个税扣缴义务人"))); + errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(542318, "个税扣缴义务人错误，系统内不存在该个税扣缴义务人")); excelComments.add(errorMessageMap); -// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(102840, "个税扣缴义务人错误，系统内不存在该个税扣缴义务人"), i, i, j, j); +// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(542318, "个税扣缴义务人错误，系统内不存在该个税扣缴义务人"), i, i, j, j); } } } else { @@ -845,7 +845,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc if (salaryItemId == null || salaryItemId <= 0) { isError = true; Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(100579, SalaryI18nUtil.getI18nLabel(102840, "本次核算所用账套不包含该薪资项目"))); + errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(542319, "本次核算所用账套不包含该薪资项目")); excelComments.add(errorMessageMap); // salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(102841, "表头错误，本次核算所用账套不包含该薪资项目"), i, i, j, j); } else { @@ -903,9 +903,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc && !salaryAcctEmployeeMap.containsKey(employeeId + "-" + taxAgentId)) { isError = true; Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(100579, SalaryI18nUtil.getI18nLabel(102840, "本次薪资核算不包含该人员"))); + errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(542320, "本次薪资核算不包含该人员")); excelComments.add(errorMessageMap); -// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(102842, "本次薪资核算不包含该人员"), i, i, usernameIndex, usernameIndex); +// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(542320, "本次薪资核算不包含该人员"), i, i, usernameIndex, usernameIndex); } // 如果个税扣缴义务人+人员目前不在核算人员里面，不支持导入 @@ -916,9 +916,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc && !salaryAcctEmployeeMap.containsKey(employeeId + "-" + taxAgentId)) { isError = true; Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(100579, SalaryI18nUtil.getI18nLabel(102840, "本次薪资核算不包含该人员"))); + errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(542320, "本次薪资核算不包含该人员")); excelComments.add(errorMessageMap); -// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(102842, "本次薪资核算不包含该人员"), i, i, usernameIndex, usernameIndex); +// salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(542320, "本次薪资核算不包含该人员"), i, i, usernameIndex, usernameIndex); } } // 每处理50个数据更新一次进度 diff --git a/src/com/engine/salary/service/impl/SalaryAcctProgressServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctProgressServiceImpl.java index c3d22e069..6d5b65aa1 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctProgressServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctProgressServiceImpl.java @@ -5,6 +5,7 @@ import com.engine.core.impl.Service; import com.engine.salary.entity.salaryacct.dto.SalaryAcctProgressDTO; import com.engine.salary.service.SalaryAcctProgressService; import com.engine.salary.util.JsonUtil; +import com.engine.salary.util.SalaryI18nUtil; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; @@ -61,7 +62,7 @@ public class SalaryAcctProgressServiceImpl extends Service implements SalaryAcct if (salaryAcctProgress == null || !salaryAcctProgress.isStatus()) { return; } - salaryAcctProgress.setTitle("核算完成"); + salaryAcctProgress.setTitle(SalaryI18nUtil.getI18nLabel(542321, "核算完成")); salaryAcctProgress.setCalculatedQuantity(salaryAcctProgress.getTotalQuantity()); salaryAcctProgress.setProgress(BigDecimal.ONE); salaryAcctProgress.setCheckStatus(checkStatus); @@ -77,7 +78,7 @@ public class SalaryAcctProgressServiceImpl extends Service implements SalaryAcct if (salaryAcctProgress == null || !salaryAcctProgress.isStatus()) { return; } - salaryAcctProgress.setTitle("核算中"); + salaryAcctProgress.setTitle(SalaryI18nUtil.getI18nLabel(542322, "核算中")); salaryAcctProgress.setCalculatedQuantity(salaryAcctProgress.getTotalQuantity()); salaryAcctProgress.setProgress(progress); salaryAcctProgress.setCheckStatus(checkStatus); @@ -98,7 +99,7 @@ public class SalaryAcctProgressServiceImpl extends Service implements SalaryAcct public SalaryAcctProgressDTO del(String cacheKey) { Util_DataCache.clearVal(cacheKey); SalaryAcctProgressDTO salaryAcctProgressDTO = new SalaryAcctProgressDTO(); - salaryAcctProgressDTO.setMessage("核算失败"); + salaryAcctProgressDTO.setMessage(SalaryI18nUtil.getI18nLabel(542323, "核算失败")); salaryAcctProgressDTO.setStatus(false); return salaryAcctProgressDTO; } diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index bea682a28..895ddb191 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -193,7 +193,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getById(id); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } //上个月日期 @@ -217,7 +217,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe public List listById4OtherConsolidatedTax(Long id) { SalaryAcctRecordPO salaryAcctRecordPO = getById(id); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 查询所有薪资类型为工资薪金的账套 List salarySobPOS = getSalarySobService(user).listByIncomeCategory(IncomeCategoryEnum.WAGES_AND_SALARIES); @@ -239,7 +239,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe // 查询薪资核算 SalaryAcctRecordPO salaryAcctRecordPO = getById(id); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 查询薪资核算所用薪资账套的薪资周期、考勤周期…… return getSalarySobService(user).getSalarySobCycle(salaryAcctRecordPO.getSalarySobId(), SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth())); @@ -327,12 +327,12 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe .findAny() .orElse(null); if (Objects.nonNull(notArchivedSalaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98754, "薪资所属期") + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542324, "薪资所属期") + "{0}" - + SalaryI18nUtil.getI18nLabel(98754, "薪资核算结果还未归档，") - + SalaryI18nUtil.getI18nLabel(98754, "薪资所属期") + + SalaryI18nUtil.getI18nLabel(542325, "薪资核算结果还未归档，") + + SalaryI18nUtil.getI18nLabel(542324, "薪资所属期") + "{1}" - + SalaryI18nUtil.getI18nLabel(98754, "不能新建薪资核算") + + SalaryI18nUtil.getI18nLabel(542326, "不能新建薪资核算") .replace("{0}", SalaryDateUtil.localDate2YearMonth(notArchivedSalaryAcctRecordPO.getTaxCycle()).toString()) .replace("{1}", salarySobCycleDTO.getTaxCycle().toString())); // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98754, "薪资所属期{0}的薪资核算结果还未归档，不能新建薪资所属期{1}的薪资核算") @@ -346,12 +346,12 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe .findAny() .orElse(null); if (Objects.nonNull(havaSalaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98754, "薪资所属期") + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542324, "薪资所属期") + "{0}" - + SalaryI18nUtil.getI18nLabel(98754, "薪资核算结果已经归档，") - + SalaryI18nUtil.getI18nLabel(98754, "薪资所属期") + + SalaryI18nUtil.getI18nLabel(542327, "薪资核算结果已经归档，") + + SalaryI18nUtil.getI18nLabel(542324, "薪资所属期") + "{1}" - + SalaryI18nUtil.getI18nLabel(98754, "不能新建薪资核算") + + SalaryI18nUtil.getI18nLabel(542326, "不能新建薪资核算") .replace("{0}", SalaryDateUtil.localDate2YearMonth(havaSalaryAcctRecordPO.getSalaryMonth()).toString()) .replace("{1}", salarySobCycleDTO.getSalaryMonth().toString())); // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98755, "薪资所属期{0}的薪资核算结果已经归档，不能新建薪资所属期{1}的薪资核算") @@ -371,10 +371,10 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe if (Objects.nonNull(hasArchivedSalaryAcctRecordPO)) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542240, "税款所属期") + "{0}" - + SalaryI18nUtil.getI18nLabel(98754, "薪资核算结果已经归档，") + + SalaryI18nUtil.getI18nLabel(542327, "薪资核算结果已经归档，") + SalaryI18nUtil.getI18nLabel(542240, "税款所属期") + "{1}" - + SalaryI18nUtil.getI18nLabel(98754, "不能新建薪资核算") + + SalaryI18nUtil.getI18nLabel(542326, "不能新建薪资核算") .replace("{0}", SalaryDateUtil.localDate2YearMonth(hasArchivedSalaryAcctRecordPO.getTaxCycle()).toString()) .replace("{1}", salarySobCycleDTO.getTaxCycle().toString())); // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98752, "税款所属期{0}的薪资核算结果已经归档，不能新建税款所属期{1}的薪资核算") @@ -390,10 +390,10 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe if (Objects.nonNull(notDeclaredSalaryAcctRecordPO)) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542240, "税款所属期") + "{0}" - + SalaryI18nUtil.getI18nLabel(98754, "薪资核算结果还未申报，") + + SalaryI18nUtil.getI18nLabel(542328, "薪资核算结果还未申报，") + SalaryI18nUtil.getI18nLabel(542240, "税款所属期") + "{1}" - + SalaryI18nUtil.getI18nLabel(98754, "不能新建薪资核算") + + SalaryI18nUtil.getI18nLabel(542326, "不能新建薪资核算") .replace("{0}", SalaryDateUtil.localDate2YearMonth(notDeclaredSalaryAcctRecordPO.getTaxCycle()).toString()) .replace("{1}", salarySobCycleDTO.getTaxCycle().toString())); // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98751, "税款所属期{0}的薪资核算结果还未申报，不能新建税款所属期{1}的薪资核算") @@ -409,10 +409,10 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe if (Objects.nonNull(hasDeclaredSalaryAcctRecordPO)) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542240, "税款所属期") + "{0}" - + SalaryI18nUtil.getI18nLabel(98754, "薪资核算结果已经申报，") + + SalaryI18nUtil.getI18nLabel(542329, "薪资核算结果已经申报，") + SalaryI18nUtil.getI18nLabel(542240, "税款所属期") + "{1}" - + SalaryI18nUtil.getI18nLabel(98754, "不能新建薪资核算") + + SalaryI18nUtil.getI18nLabel(542326, "不能新建薪资核算") .replace("{0}", SalaryDateUtil.localDate2YearMonth(hasDeclaredSalaryAcctRecordPO.getTaxCycle()).toString()) .replace("{1}", salarySobCycleDTO.getTaxCycle().toString())); // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98753, "税款所属期{0}的薪资核算结果已经申报，不能新建税款所属期{1}的薪资核算") @@ -429,12 +429,12 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe .findAny() .orElse(null); if (Objects.nonNull(notArchivedSalaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98754, "薪资所属期") + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542324, "薪资所属期") + "{0}" - + SalaryI18nUtil.getI18nLabel(98754, "薪资核算结果还未归档，") - + SalaryI18nUtil.getI18nLabel(98754, "薪资所属期") + + SalaryI18nUtil.getI18nLabel(542325, "薪资核算结果还未归档，") + + SalaryI18nUtil.getI18nLabel(542324, "薪资所属期") + "{1}" - + SalaryI18nUtil.getI18nLabel(98754, "不能新建薪资核算") + + SalaryI18nUtil.getI18nLabel(542326, "不能新建薪资核算") .replace("{0}", SalaryDateUtil.localDate2YearMonth(notArchivedSalaryAcctRecordPO.getTaxCycle()).toString()) .replace("{1}", salarySobCycleDTO.getTaxCycle().toString())); // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98754, "薪资所属期{0}的薪资核算结果还未归档，不能新建薪资所属期{1}的薪资核算") @@ -450,10 +450,10 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe if (Objects.nonNull(hasArchivedSalaryAcctRecordPO)) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542240, "税款所属期") + "{0}" - + SalaryI18nUtil.getI18nLabel(98754, "薪资核算结果已经归档，") + + SalaryI18nUtil.getI18nLabel(542327, "薪资核算结果已经归档，") + SalaryI18nUtil.getI18nLabel(542240, "税款所属期") + "{1}" - + SalaryI18nUtil.getI18nLabel(98754, "不能新建薪资核算") + + SalaryI18nUtil.getI18nLabel(542326, "不能新建薪资核算") .replace("{0}", SalaryDateUtil.localDate2YearMonth(hasArchivedSalaryAcctRecordPO.getTaxCycle()).toString()) .replace("{1}", salarySobCycleDTO.getTaxCycle().toString())); // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98752, "税款所属期{0}的薪资核算结果已经归档，不能新建税款所属期{1}的薪资核算") @@ -464,7 +464,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe //获取账套下从重启月至所在年的最后一天的所有核算结果 Date taxDeclarationRebootDate = getSalarySysConfService(user).getTaxDeclarationRebootDate(); if (taxDeclarationRebootDate == null) { - throw new SalaryRunTimeException("个税申报功能异常"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542330, "个税申报功能异常")); } LocalDateRange taxCycleRebootYearRange = LocalDateRange.builder() @@ -481,10 +481,10 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe if (Objects.nonNull(notDeclaredSalaryAcctRecordPO)) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542240, "税款所属期") + "{0}" - + SalaryI18nUtil.getI18nLabel(98754, "薪资核算结果还未申报，") + + SalaryI18nUtil.getI18nLabel(542328, "薪资核算结果还未申报，") + SalaryI18nUtil.getI18nLabel(542240, "税款所属期") + "{1}" - + SalaryI18nUtil.getI18nLabel(98754, "不能新建薪资核算") + + SalaryI18nUtil.getI18nLabel(542326, "不能新建薪资核算") .replace("{0}", SalaryDateUtil.localDate2YearMonth(notDeclaredSalaryAcctRecordPO.getTaxCycle()).toString()) .replace("{1}", salarySobCycleDTO.getTaxCycle().toString())); // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98751, "税款所属期{0}的薪资核算结果还未申报，不能新建税款所属期{1}的薪资核算") @@ -501,10 +501,10 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe if (Objects.nonNull(hasDeclaredSalaryAcctRecordPO)) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542240, "税款所属期") + "{0}" - + SalaryI18nUtil.getI18nLabel(98754, "薪资核算结果已经申报，") + + SalaryI18nUtil.getI18nLabel(542329, "薪资核算结果已经申报，") + SalaryI18nUtil.getI18nLabel(542240, "税款所属期") + "{1}" - + SalaryI18nUtil.getI18nLabel(98754, "不能新建薪资核算") + + SalaryI18nUtil.getI18nLabel(542326, "不能新建薪资核算") .replace("{0}", SalaryDateUtil.localDate2YearMonth(hasDeclaredSalaryAcctRecordPO.getTaxCycle()).toString()) .replace("{1}", salarySobCycleDTO.getTaxCycle().toString())); // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98753, "税款所属期{0}的薪资核算结果已经申报，不能新建税款所属期{1}的薪资核算") @@ -526,7 +526,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe // 查询薪资核算记录 List salaryAcctRecordPOS = listByIds(ids); if (CollectionUtils.isEmpty(salaryAcctRecordPOS)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 更新薪资核算记录的状态 Date now = new Date(); @@ -542,13 +542,13 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe // 查询薪资核算记录 List salaryAcctRecordPOS = listByIds(ids); if (CollectionUtils.isEmpty(salaryAcctRecordPOS)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } ids = SalaryEntityUtil.properties(salaryAcctRecordPOS, SalaryAcctRecordPO::getId); // 只有未归档的薪资核算记录才允许删除 boolean hasArchived = salaryAcctRecordPOS.stream().anyMatch(salaryAcctRecordPO -> !Objects.equals(salaryAcctRecordPO.getStatus(), SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue())); if (hasArchived) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98748, "只有未归档的薪资核算记录才允许删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542331, "只有未归档的薪资核算记录才允许删除")); } // 查询账套（记录日志用） Set salarySobIds = SalaryEntityUtil.properties(salaryAcctRecordPOS, SalaryAcctRecordPO::getSalarySobId); @@ -596,7 +596,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getById(salaryAcctRecordId); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } //todo 如果存在未忽略的校验异常，不允许归档 // List salaryCheckResultPOS = salaryCheckResultService.listBySalaryAcctRecordIdAndIgnoreType(salaryAcctRecordId, NumberUtils.INTEGER_ZERO); @@ -605,7 +605,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe // } List salaryAcctResultPOS = getSalaryAcctResultService(user).listBySalaryAcctRecordIds(Collections.singleton(salaryAcctRecordId)); if (CollectionUtils.isEmpty(salaryAcctResultPOS)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(99691, "尚未核算，请先核算后再归档")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542332, "尚未核算，请先核算后再归档")); } // 更新薪资核算记录的状态 salaryAcctRecordPO.setStatus(SalaryAcctRecordStatusEnum.ARCHIVED.getValue()); @@ -633,7 +633,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getById(salaryAcctRecordId); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 重新核算 reCalcOrBackCalc(salaryAcctRecordPO, true); @@ -681,12 +681,12 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe private void reCalcOrBackCalc(SalaryAcctRecordPO salaryAcctRecordPO, boolean isReCalc) { // 如果薪资核算记录还未归档，不允许重新核算 if (Objects.equals(salaryAcctRecordPO.getStatus(), SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98819, "薪资核算结果还未归档，可直接核算")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542333, "薪资核算结果还未归档，可直接核算")); } // 税款所在年的日期范围（第一天～最后一天） LocalDateRange yearRange = SalaryDateUtil.localDate2YearRange(salaryAcctRecordPO.getSalaryMonth()); if (Objects.isNull(yearRange)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "薪资所属月为空")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542334, "薪资所属月为空")); } // 查询税款所在年的该个税扣缴义务人所有薪资核算记录 // 获取账套所属个税扣缴义务人的核算记录 @@ -706,9 +706,9 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe if (Objects.nonNull(afterSalaryAcctRecordPO)) { throw new SalaryRunTimeException( "{0}" - + SalaryI18nUtil.getI18nLabel(105826, "已经存在薪资核算记录，") + + SalaryI18nUtil.getI18nLabel(542335, "已经存在薪资核算记录，") + "{1}" - + SalaryI18nUtil.getI18nLabel(105826, "不能重新核算薪资") + + SalaryI18nUtil.getI18nLabel(542336, "不能重新核算薪资") .replace("{0}", SalaryDateUtil.localDate2YearMonth(afterSalaryAcctRecordPO.getSalaryMonth()).toString()) .replace("{1}", SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()).toString())); // throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(105826, "已经存在{0}的薪资核算记录了，不能重新核算{1}的薪资了") @@ -775,12 +775,12 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getById(id); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 查询账套 SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId()); if (Objects.isNull(salarySobPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98769, "薪资账套不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542303, "薪资账套不存在或已被删除")); } return salarySobPO.getName() + SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()); } @@ -805,20 +805,20 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getById(salaryAcctRecordId); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 获取该账套该月核算的所有记录 List salaryAcctRecordPOS = getSalaryAcctRecordMapper().listSome(SalaryAcctRecordPO.builder().salaryMonth(salaryAcctRecordPO.getSalaryMonth()).salarySobId(salaryAcctRecordPO.getSalarySobId()).deleteType(0).build()); // 只有该账套在此月的最后一次核算才能进行回算 if (!salaryAcctRecordPO.getAcctTimes().equals(salaryAcctRecordPOS.size())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "只有核算次数为最后一次时，才能进行回算")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542337, "只有核算次数为最后一次时，才能进行回算")); } // 只有正常核算全部发送完才能进行回算 SalarySendPO build = SalarySendPO.builder().salaryAccountingId(salaryAcctRecordId).deleteType(0).build(); List salarySends = getSalarySendMapper().listSome(build); salarySends.stream().forEach(salarySend -> { if (salarySend.getSendNum() < salarySend.getSendTotal()) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(139702, "正常核算工资单尚未全部发送完成，不能进行回算")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542338, "正常核算工资单尚未全部发送完成，不能进行回算")); } }); diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 04c2c5eb4..8bf98196c 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -203,7 +203,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe // 查询薪资核算人员 SalaryAcctEmployeePO salaryAcctEmployeePO = getSalaryAcctEmployeeService(user).getById(salaryAcctEmployeeId); if (Objects.isNull(salaryAcctEmployeePO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98831, "薪资核算人员不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542301, "薪资核算人员不存在或已被删除")); } // 查询是否是回算 SalaryAcctRecordPO byId = getSalaryAcctRecordService(user).getById(salaryAcctEmployeePO.getSalaryAcctRecordId()); @@ -292,7 +292,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(queryParam.getSalaryAcctRecordId()); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 查询薪资核算所用薪资账套的薪资项目 List salarySobItemPOS = getSalarySobItemService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId()); @@ -339,7 +339,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(queryParam.getSalaryAcctRecordId()); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } boolean isBackCalc = Objects.equals(salaryAcctRecordPO.getBackCalcStatus(), 1); // 查询薪资核算所用的薪资账套的员工信息字段 @@ -385,14 +385,14 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe Map expressFormulaMap = SalaryEntityUtil.convert2Map(expressFormulas, ExpressFormula::getId, ExpressFormula::getFormula); Map customParameters = SalaryEntityUtil.convert2Map(salarySobItemPOS, SalarySobItemPO::getSalaryItemId, salarySobItemPO -> { if (salarySobItemPO.getFormulaId() <= 0) { - return SalaryI18nUtil.getI18nLabel(92004, "输入/导入"); + return SalaryI18nUtil.getI18nLabel(542339, "输入/导入"); } return expressFormulaMap.getOrDefault(salarySobItemPO.getFormulaId(), StringUtils.EMPTY); }); // 回算公式内容转换 Map customBackCalcParameters = SalaryEntityUtil.convert2Map(salarySobBackItemPOList, SalarySobBackItemPO::getSalaryItemId, salarySobBackItemPO -> { if (salarySobBackItemPO.getFormulaId() <= 0) { - return SalaryI18nUtil.getI18nLabel(92004, "输入/导入"); + return SalaryI18nUtil.getI18nLabel(542339, "输入/导入"); } return expressFormulaMap.getOrDefault(salarySobBackItemPO.getFormulaId(), StringUtils.EMPTY); }); @@ -408,7 +408,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe // 查询当前的薪资核算人员 SalaryAcctEmployeePO salaryAcctEmployeePO = getSalaryAcctEmployeeService(user).getById(salaryAcctEmployeeId); if (Objects.isNull(salaryAcctEmployeePO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98831, "薪资核算人员不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542301, "薪资核算人员不存在或已被删除")); } // 查询当前的薪资核算人员的个税扣缴义务人 TaxAgentPO taxAgentPO = getTaxAgentService(user).getById(salaryAcctEmployeePO.getTaxAgentId()); @@ -455,7 +455,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe public Map getColumnBySalaryAcctRecordId(Long salaryAcctRecordId) { SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(salaryAcctRecordId); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } Map resultMap = Maps.newHashMap(); // 查询薪资核算使用的薪资账套下的薪资项目 @@ -507,7 +507,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe // 查询薪资核算人员 SalaryAcctEmployeePO salaryAcctEmployeePO = getSalaryAcctEmployeeService(user).getById(saveParam.getSalaryAcctEmpId()); if (Objects.isNull(salaryAcctEmployeePO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98831, "薪资核算人员不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542301, "薪资核算人员不存在或已被删除")); } // 查询原来的薪资核算结果 List salaryAcctResultPOSOld = getSalaryAcctResultMapper().listSome(SalaryAcctResultPO.builder().salaryAcctEmpId(saveParam.getSalaryAcctEmpId()).build()); @@ -595,23 +595,23 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe // 1、查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(calculateParam.getSalaryAcctRecordId()); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } //查询对应账套 SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId()); if (Objects.isNull(salarySobPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资账套不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542303, "薪资账套不存在或已被删除")); } // 1.1、如果薪资核算记录已经归档了，就不能继续核算 if (!Objects.equals(salaryAcctRecordPO.getStatus(), SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(99148, "当前薪资核算记录已归档，请重新打开后再进行核算")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542340, "当前薪资核算记录已归档，请重新打开后再进行核算")); } // 2、查询薪资核算记录的薪资周期、考勤周期等 SalarySobCycleDTO salarySobCycleDTO = getSalaryAcctRecordService(user).getSalarySobCycleById(calculateParam.getSalaryAcctRecordId()); // 3、查询薪资核算记录所用薪资账套的薪资项目副本 List salarySobItemPOS = getSalarySobItemService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId()); if (CollectionUtils.isEmpty(salarySobItemPOS)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(99151, "当前所用的薪资账套未选择任何薪资项目，无法核算")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542341, "当前所用的薪资账套未选择任何薪资项目，无法核算")); } // 回算薪资项目 List salarySobBackItems = Collections.emptyList(); @@ -658,10 +658,10 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe salaryAcctEmployeePOS = getSalaryAcctEmployeeService(user).listByIds(calculateParam.getIds()); } if (CollectionUtils.isEmpty(salaryAcctEmployeePOS)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(103378, "薪资核算人员不能为空")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542342, "薪资核算人员不能为空")); } // 11.1、初始化进度 - SalaryAcctProgressDTO initProgress = new SalaryAcctProgressDTO().setTitle(SalaryI18nUtil.getI18nLabel(97515, "核算中")).setTitleLabelId(97515L).setTotalQuantity(salaryAcctEmployeePOS.size() * 2 + 1).setCalculatedQuantity(0).setProgress(BigDecimal.ZERO).setStatus(true).setMessage(StringUtils.EMPTY); + SalaryAcctProgressDTO initProgress = new SalaryAcctProgressDTO().setTitle(SalaryI18nUtil.getI18nLabel(542322, "核算中")).setTitleLabelId(542322L).setTotalQuantity(salaryAcctEmployeePOS.size() * 2 + 1).setCalculatedQuantity(0).setProgress(BigDecimal.ZERO).setStatus(true).setMessage(StringUtils.EMPTY); getSalaryAcctProgressService(user).initProgress(SalaryCacheKey.ACCT_PROGRESS + calculateParam.getSalaryAcctRecordId(), initProgress); // 12、对薪资核算人员进行拆分 List> partition = Lists.partition(salaryAcctEmployeePOS, 5000); @@ -735,7 +735,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe } catch (Exception e) { log.info("薪资核算出错：{}", e.getMessage(), e); // throw new SalaryRunTimeException(e); - getSalaryAcctProgressService(user).fail(SalaryCacheKey.ACCT_PROGRESS + calculateParam.getSalaryAcctRecordId(), SalaryI18nUtil.getI18nLabel(99642, "薪资核算出错") + ": " + e.getMessage()); + getSalaryAcctProgressService(user).fail(SalaryCacheKey.ACCT_PROGRESS + calculateParam.getSalaryAcctRecordId(), SalaryI18nUtil.getI18nLabel(542343, "薪资核算出错") + ": " + e.getMessage()); } finally { // 数据库字段加密用 } diff --git a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java index ddd06fcec..4cbf9d3dc 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java @@ -121,11 +121,11 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch // } else if (isStopList) { // queryParam.setRunStatusList(Arrays.asList(SalaryArchiveStatusEnum.STOP_FROM_PENDING.getValue(), SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue())); // } -// String nameI18n = SalaryI18nUtil.getI18nLabel(85368, "薪资档案") + +// String nameI18n = SalaryI18nUtil.getI18nLabel(538004, "薪资档案") + // SalaryI18nUtil.getI18nLabel(queryParam.getListType().getLabelId(), queryParam.getListType().getDefaultLabel()); -// String payStartDateI18n = SalaryI18nUtil.getI18nLabel(109527, "起始发薪日期"); -// String payEndDateI18n = SalaryI18nUtil.getI18nLabel(109329, "最后发薪日期"); -// String effectiveTimeI18n = SalaryI18nUtil.getI18nLabel(85904, "生效日期"); +// String payStartDateI18n = SalaryI18nUtil.getI18nLabel(542346, "起始发薪日期"); +// String payEndDateI18n = SalaryI18nUtil.getI18nLabel(542347, "最后发薪日期"); +// String effectiveTimeI18n = SalaryI18nUtil.getI18nLabel(19548, "生效日期"); // // List sheetList = new ArrayList<>(); // ExcelSheetData excelSheetData = new ExcelSheetData(); @@ -135,8 +135,8 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch // List headerList = Lists.newArrayList(); // headerList.add(SalaryI18nUtil.getI18nLabel(25034, "姓名")); // headerList.add(SalaryI18nUtil.getI18nLabel(537996, "个税扣缴义务人")); -// headerList.add(SalaryI18nUtil.getI18nLabel(121908, "收入所得项目")); -// headerList.add(SalaryI18nUtil.getI18nLabel(87889, "薪资账套")); +// headerList.add(SalaryI18nUtil.getI18nLabel(542345, "收入所得项目")); +// headerList.add(SalaryI18nUtil.getI18nLabel(538010, "薪资账套")); // headerList.add(SalaryI18nUtil.getI18nLabel(1516, "入职日期")); // headerList.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门")); // headerList.add(SalaryI18nUtil.getI18nLabel(125238, "手机号")); @@ -252,7 +252,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch boolean isInit = queryParam.getImportType().equals(SalaryArchiveImportTypeEnum.INIT.getValue()); boolean isSalaryItemAdjust = queryParam.getImportType().equals(SalaryArchiveImportTypeEnum.SALARYITEMADJUST.getValue()); // 名称 - String nameI18n = SalaryI18nUtil.getI18nLabel(101601, "薪资档案导入模板") + String nameI18n = SalaryI18nUtil.getI18nLabel(542344, "薪资档案导入模板") + SalaryI18nUtil.getI18nLabel(queryParam.getListType().getLabelId(), queryParam.getListType().getDefaultLabel()); if (isFixedList) { // 初始化 @@ -273,8 +273,8 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch List header = Lists.newArrayList(); header.add(SalaryI18nUtil.getI18nLabel(25034,"姓名")); header.add(SalaryI18nUtil.getI18nLabel(537996, "个税扣缴义务人")); -// header.add(SalaryI18nUtil.getI18nLabel(121908, "收入所得项目")); -// header.add(SalaryI18nUtil.getI18nLabel(87889, "薪资账套")); +// header.add(SalaryI18nUtil.getI18nLabel(542345, "收入所得项目")); +// header.add(SalaryI18nUtil.getI18nLabel(538010, "薪资账套")); // header.add(SalaryI18nUtil.getI18nLabel(1516, "入职日期")); header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门")); header.add(SalaryI18nUtil.getI18nLabel(125238, "手机号")); @@ -283,10 +283,10 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch // header.add(SalaryI18nUtil.getI18nLabel(106277, "身份证号码")); // } // header.add(SalaryI18nUtil.getI18nLabel(109332, "人事状态")); - String payStartDateI18n = SalaryI18nUtil.getI18nLabel(109527, "起始发薪日期"); - String payEndDateI18n = SalaryI18nUtil.getI18nLabel(109329, "最后发薪日期"); - String adjustReasonI18n = SalaryI18nUtil.getI18nLabel(85431, "调整原因"); - String effectiveTimeI18n = SalaryI18nUtil.getI18nLabel(85904, "生效日期"); + String payStartDateI18n = SalaryI18nUtil.getI18nLabel(542346, "起始发薪日期"); + String payEndDateI18n = SalaryI18nUtil.getI18nLabel(542347, "最后发薪日期"); + String adjustReasonI18n = SalaryI18nUtil.getI18nLabel(1897, "调整原因"); + String effectiveTimeI18n = SalaryI18nUtil.getI18nLabel(19548, "生效日期"); if (isPendingList) { header.add(payStartDateI18n); header.add(payEndDateI18n); @@ -395,19 +395,19 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch // SalaryArchiveExcelBO.createExcelComment(excelComments, requireI18n + '，' + SalaryI18nUtil.getI18nLabel(127641, "多个账套之间用,分隔"), 0, 0, 3, 3); // int i = enableHr ? 10 : 9; if (isPendingList) { - excelComments.add(new ExcelComment(5, 0, 8, 2, SalaryI18nUtil.getI18nLabel(100458, "格式样例为'2022-01-01'、'2022/1/1'"))); -// excelComments.add(new ExcelComment(5, 0, 8, 2, SalaryI18nUtil.getI18nLabel(100458, "格式样例为'2022-01-01'、'2022/1/1'"))); + excelComments.add(new ExcelComment(5, 0, 8, 2, SalaryI18nUtil.getI18nLabel(542348, "格式样例为'2022-01-01'、'2022/1/1'"))); +// excelComments.add(new ExcelComment(5, 0, 8, 2, SalaryI18nUtil.getI18nLabel(542348, "格式样例为'2022-01-01'、'2022/1/1'"))); } else if (isFixedList) { if (isInit) { - excelComments.add(new ExcelComment(5, 0, 8, 2, SalaryI18nUtil.getI18nLabel(100458, "必填，格式样例为'2022-01-01'、'2022/1/1'"))); - excelComments.add(new ExcelComment(6, 0, 9, 2, SalaryI18nUtil.getI18nLabel(100458, "格式样例为'2022-01-01'、'2022/1/1'"))); - excelComments.add(new ExcelComment(7, 0, 10, 2, SalaryI18nUtil.getI18nLabel(100458, "必填，格式样例为'2022-01-01'、'2022/1/1'"))); + excelComments.add(new ExcelComment(5, 0, 8, 2, SalaryI18nUtil.getI18nLabel(542349, "必填，格式样例为'2022-01-01'、'2022/1/1'"))); + excelComments.add(new ExcelComment(6, 0, 9, 2, SalaryI18nUtil.getI18nLabel(542348, "格式样例为'2022-01-01'、'2022/1/1'"))); + excelComments.add(new ExcelComment(7, 0, 10, 2, SalaryI18nUtil.getI18nLabel(542349, "必填，格式样例为'2022-01-01'、'2022/1/1'"))); } else if (isSalaryItemAdjust) { - excelComments.add(new ExcelComment(5, 0, 8, 2, SalaryI18nUtil.getI18nLabel(100458, "必填,可填写如:入职,转正,调薪,调岗调薪,离职,其他,初始化"))); - excelComments.add(new ExcelComment(6, 0, 9, 2, SalaryI18nUtil.getI18nLabel(100458, "必填，格式样例为'2022-01-01'、'2022/1/1'"))); + excelComments.add(new ExcelComment(5, 0, 8, 2, SalaryI18nUtil.getI18nLabel(542350, "必填,可填写如:入职,转正,调薪,调岗调薪,离职,其他,初始化"))); + excelComments.add(new ExcelComment(6, 0, 9, 2, SalaryI18nUtil.getI18nLabel(542349, "必填，格式样例为'2022-01-01'、'2022/1/1'"))); } } else if (isSuspendList) { -// SalaryArchiveExcelBO.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(109736, "格式样例为'2022-01-01'、'2022/1/1'"), 0, 0, i + 1, i + 1); +// SalaryArchiveExcelBO.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(542348, "格式样例为'2022-01-01'、'2022/1/1'"), 0, 0, i + 1, i + 1); } // return ExcelUtil.genWorkbookV2(rows, finalNameI18n, excelComments); @@ -489,7 +489,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch for (int j = 0; j < headers.size(); j++) { String header = headers.get(j); String key = header; - if (key.equals(SalaryI18nUtil.getI18nLabel(85904, "生效日期"))) { + if (key.equals(SalaryI18nUtil.getI18nLabel(19548, "生效日期"))) { effectiveTimeIndex = j; } } @@ -599,7 +599,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch for (int j = 0; j < headers.size(); j++) { String header = headers.get(j); String key = header; - if (key.equals(SalaryI18nUtil.getI18nLabel(85904, "生效日期"))) { + if (key.equals(SalaryI18nUtil.getI18nLabel(19548, "生效日期"))) { effectiveTimeIndex = j; } } diff --git a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java index 8e3a35a77..1885daed6 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java @@ -213,18 +213,18 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi boolean isDisabled = salaryArchive.getRunStatus().equals(SalaryArchiveStatusEnum.STOP_FROM_PENDING.getValue()) || salaryArchive.getRunStatus().equals(SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue()); if (isDisabled) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(115437, "停薪列表禁止操作")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542351, "停薪列表禁止操作")); } SalaryArchiveItemPO salaryArchiveItem = null; if (salaryArchiveItemSaveParam.getSalaryArchiveItemId() != null ) { salaryArchiveItem = salaryArchiveItemMapper.getById(salaryArchiveItemSaveParam.getSalaryArchiveItemId()); if (salaryArchiveItem == null || !salaryArchiveItem.getSalaryArchiveId().equals(salaryArchiveId)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100428, "该薪资档案的薪资项目的调整记录不存在")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542352, "该薪资档案的薪资项目的调整记录不存在")); } if (salaryArchiveItemSaveParam.getSalaryArchiveItems().size() > 1) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(149535, "单个调整不能处理多个薪资项目")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542353, "单个调整不能处理多个薪资项目")); } else if (!salaryArchiveItems.get(0).getSalaryItemId().equals(salaryArchiveItem.getSalaryItemId())){ - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel( 149539, "单个调薪的目标项目和调整明细项目id不一致")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel( 542354, "单个调薪的目标项目和调整明细项目id不一致")); } } // 构建更新PO @@ -270,7 +270,7 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi if(!salaryArchiveItemSaveParam.getEffectiveTime().equals(salaryArchiveItem.getEffectiveTime())){ boolean isEffectiveTimeRepeat = list.stream().anyMatch(it -> it.getEffectiveTime().equals(saveEffectiveTime)); if (isEffectiveTimeRepeat) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(153539, "已经存在该生效日期的调整记录，请修改生效日期")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542355, "已经存在该生效日期的调整记录，请修改生效日期")); } } @@ -281,7 +281,7 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi // 1.1 如果保存的生效日期早于<当前已生效 // if (saveEffectiveTime.before(effectiveTime)) { // if(salaryArchiveItemSaveParam.getCanOperator() == Boolean.TRUE){ -// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100429, "生效日期不可早于当前已生效的调整日期")); +// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542357, "生效日期不可早于当前已生效的调整日期")); // } // // 仅可编辑说明 // salaryArchiveItemMapper.updateIgnoreNull( SalaryArchiveItemPO.builder().id(salaryArchiveItemSaveParam.getSalaryArchiveItemId()) @@ -356,7 +356,7 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi // 薪资档案 SalaryArchivePO salaryArchive = salaryArchiveMapper.getById(salaryArchiveId); if (salaryArchive == null) { - throw new SalaryRunTimeException("薪资档案不存在！"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542356, "薪资档案不存在！")); } @@ -391,29 +391,29 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi Date effectiveTime = effectiveSalaryItem.getEffectiveTime(); // 1.1 如果早于<当前已生效 if (saveEffectiveTime.before(effectiveTime)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100429, "生效日期不可早于当前已生效的调整日期")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542357, "生效日期不可早于当前已生效的调整日期")); // 1.2 如果等于当前已生效 fixme 日期比较可能有bug } else if (saveEffectiveTime.equals(effectiveTime)) { if (effectiveBeforeSalaryItem != null && effectiveBeforeSalaryItem.getItemValue().equals(e.getAdjustValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100432, "调整前后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542358, "调整前后不可相同")); } if (ineffectiveSalaryItem != null && ineffectiveSalaryItem.getItemValue().equals(e.getAdjustValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542359, "与未生效的调整后不可相同")); } // 1.3 如果>已经生效且<=今天 } else if (saveEffectiveTime.after(effectiveTime) && !saveEffectiveTime.after(today)) { if (effectiveSalaryItem.getItemValue().equals(e.getAdjustValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100432, "调整前后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542358, "调整前后不可相同")); } if (ineffectiveSalaryItem != null && ineffectiveSalaryItem.getItemValue().equals(e.getAdjustValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542359, "与未生效的调整后不可相同")); } // 1.4 如果>今天 } else if (saveEffectiveTime.after(today) && effectiveSalaryItem.getItemValue().equals(e.getAdjustValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100432, "调整前后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542358, "调整前后不可相同")); } } else if (ineffectiveSalaryItem != null && ineffectiveSalaryItem.getItemValue().equals(e.getAdjustValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542359, "与未生效的调整后不可相同")); } // 2.数据处理 if (effectiveSalaryItem != null && saveEffectiveTime.equals(effectiveSalaryItem.getEffectiveTime())) { @@ -484,29 +484,29 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi Date effectiveTime = effectiveSalaryItem.getEffectiveTime(); // 1.1 如果早于<当前已生效 if (saveEffectiveTime.before(effectiveTime)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100429, "生效日期不可早于当前已生效的调整日期")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542357, "生效日期不可早于当前已生效的调整日期")); // 1.2 如果等于当前已生效 fixme 日期比较可能有bug } else if (saveEffectiveTime.equals(effectiveTime)) { if (effectiveBeforeSalaryItem != null && effectiveBeforeSalaryItem.getItemValue().equals(e.getAdjustValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100432, "调整前后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542358, "调整前后不可相同")); } if (ineffectiveSalaryItem != null && ineffectiveSalaryItem.getItemValue().equals(e.getAdjustValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542359, "与未生效的调整后不可相同")); } // 1.3 如果>已经生效且<=今天 } else if (saveEffectiveTime.after(effectiveTime) && !saveEffectiveTime.after(today)) { if (effectiveSalaryItem.getItemValue().equals(e.getAdjustValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100432, "调整前后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542358, "调整前后不可相同")); } if (ineffectiveSalaryItem != null && ineffectiveSalaryItem.getItemValue().equals(e.getAdjustValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542359, "与未生效的调整后不可相同")); } // 1.4 如果>今天 } else if (saveEffectiveTime.after(today) && effectiveSalaryItem.getItemValue().equals(e.getAdjustValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100432, "调整前后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542358, "调整前后不可相同")); } } else if (ineffectiveSalaryItem != null && ineffectiveSalaryItem.getItemValue().equals(e.getAdjustValue())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542359, "与未生效的调整后不可相同")); } }); @@ -542,7 +542,7 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi public String deleteSalaryItem(Long salaryArchiveItemId) { SalaryArchiveItemPO salaryArchiveItem = salaryArchiveItemMapper.getById(salaryArchiveItemId); if (salaryArchiveItem == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "参数错误，薪资项目不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542360, "参数错误，薪资项目不存在或已被删除")); } // if (salaryArchiveItem.getEffectiveTime().after(new Date())) { salaryArchiveItem.setDeleteType(1); @@ -578,21 +578,21 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi @Override public XSSFWorkbook exportAdjustRecordList(SalaryItemAdjustRecordQueryParam queryParam) { // 1.工作簿名称 - String sheetName = SalaryI18nUtil.getI18nLabel(85368, "薪资项目调整记录"); + String sheetName = SalaryI18nUtil.getI18nLabel(542361, "薪资项目调整记录"); // 获取所有可被引用的薪资项目 List salaryItems = salaryItemMapper.getCanAdjustSalaryItems(); String[] header = { SalaryI18nUtil.getI18nLabel(25034,"姓名"), SalaryI18nUtil.getI18nLabel(15890, "员工状态"), SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), - SalaryI18nUtil.getI18nLabel(84960, "薪资项目"), - SalaryI18nUtil.getI18nLabel(85433, "调整前"), - SalaryI18nUtil.getI18nLabel(85434, "调整后"), - SalaryI18nUtil.getI18nLabel(85431, "调整原因"), - SalaryI18nUtil.getI18nLabel(85904, "生效日期"), - SalaryI18nUtil.getI18nLabel(85435, "操作人"), - SalaryI18nUtil.getI18nLabel(85436, "操作时间"), - SalaryI18nUtil.getI18nLabel(84961, "备注") + SalaryI18nUtil.getI18nLabel(542362, "薪资项目"), + SalaryI18nUtil.getI18nLabel(130510, "调整前"), + SalaryI18nUtil.getI18nLabel(130511, "调整后"), + SalaryI18nUtil.getI18nLabel(1897, "调整原因"), + SalaryI18nUtil.getI18nLabel(19548, "生效日期"), + SalaryI18nUtil.getI18nLabel(17482, "操作人"), + SalaryI18nUtil.getI18nLabel(18008, "操作时间"), + SalaryI18nUtil.getI18nLabel(536726, "备注") }; // 2.表头 List headerList = new ArrayList<>(Arrays.asList(header)); diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index 26e4d406a..593dac784 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -453,7 +453,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe long employeeId = user.getUID(); // 1.工作簿名称 - String sheetName = SalaryI18nUtil.getI18nLabel(85368, "薪资档案"); + String sheetName = SalaryI18nUtil.getI18nLabel(538004, "薪资档案"); // 获取所有可被引用的薪资项目 List salaryItems = salaryItemMapper.getCanAdjustSalaryItems(); String[] header = {SalaryI18nUtil.getI18nLabel(25034,"姓名"), @@ -461,9 +461,9 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), SalaryI18nUtil.getI18nLabel(125238, "手机号"), - SalaryI18nUtil.getI18nLabel(91075, "状态"), - SalaryI18nUtil.getI18nLabel(91075, "起始发薪日期"), - SalaryI18nUtil.getI18nLabel(91075, "最后发薪日期")}; + SalaryI18nUtil.getI18nLabel(535101, "状态"), + SalaryI18nUtil.getI18nLabel(542346, "起始发薪日期"), + SalaryI18nUtil.getI18nLabel(542347, "最后发薪日期")}; // 2.表头 List headerList = new ArrayList<>(Arrays.asList(header)); for (SalaryItemPO salaryItem : salaryItems) { @@ -536,7 +536,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe public String savePaySet(SalaryArchiveSetPaySaveParam saveParam) { long currentEmployeeId = user.getUID(); if (saveParam.getStatus() == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(109201, "状态不能为空")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(389796, "状态不能为空")); } Boolean enableStatus = saveParam.getStatus().equals(SalaryArchiveStatusEnum.PENDING) || saveParam.getStatus().equals(SalaryArchiveStatusEnum.FIXED) @@ -545,11 +545,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe return StringUtils.EMPTY; } if (saveParam.getSalaryArchiveId() == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100425, "薪资档案id不能为空")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542363, "薪资档案id不能为空")); } SalaryArchivePO salaryArchive = getById(saveParam.getSalaryArchiveId()); if (salaryArchive == null) { - throw new SalaryRunTimeException(String.format(SalaryI18nUtil.getI18nLabel(100463, "薪资档案不存在！") + "[id:%s]", saveParam.getSalaryArchiveId())); + throw new SalaryRunTimeException(String.format(SalaryI18nUtil.getI18nLabel(542356, "薪资档案不存在！") + "[id:%s]", saveParam.getSalaryArchiveId())); } SalaryArchivePO oldSalaryArchive = new SalaryArchivePO(); BeanUtils.copyProperties(salaryArchive, oldSalaryArchive); @@ -569,13 +569,13 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // 待定薪 if (saveParam.getStatus().equals(SalaryArchiveStatusEnum.PENDING)) { if (saveParam.getPayStartDate() == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(109202, "起始发薪日期不能为空")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542364, "起始发薪日期不能为空")); } // 起薪日期：新人入职默认为：入职日期;返聘人员默认为：返聘开始日期;调整个税扣缴义务人：不默认日期 salaryArchive.setPayStartDate(saveParam.getPayStartDate()); if (saveParam.getPayEndDate() != null) { if (saveParam.getPayStartDate().after(saveParam.getPayEndDate())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(109214, "起始发薪日期不可晚于最后发薪日")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542365, "起始发薪日期不可晚于最后发薪日")); } } salaryArchive.setPayEndDate(saveParam.getPayEndDate()); @@ -636,22 +636,22 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // 定薪 } else if (saveParam.getStatus().equals(SalaryArchiveStatusEnum.FIXED)) { if (saveParam.getPayStartDate() == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(109202, "起始发薪日期不能为空")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542364, "起始发薪日期不能为空")); } salaryArchive.setPayStartDate(saveParam.getPayStartDate()); if (saveParam.getPayEndDate() != null) { if (saveParam.getPayStartDate().after(saveParam.getPayEndDate())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(109214, "起始发薪日期不可晚于最后发薪日")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542365, "起始发薪日期不可晚于最后发薪日")); } } salaryArchive.setPayEndDate(saveParam.getPayEndDate()); // 待停薪 } else if (saveParam.getStatus().equals(SalaryArchiveStatusEnum.SUSPEND)) { if (saveParam.getPayEndDate() == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(109203, "最后发薪日期不能为空")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542366, "最后发薪日期不能为空")); } if (saveParam.getPayStartDate().after(saveParam.getPayEndDate())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(109214, "起始发薪日期不可晚于最后发薪日")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542365, "起始发薪日期不可晚于最后发薪日")); } salaryArchive.setPayEndDate(saveParam.getPayEndDate()); } @@ -727,12 +727,12 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe SalaryArchivePO po = getSalaryArchiveMapper().getById(stopSalaryParam.getSalaryArchiveId()); if (po == null) { - throw new SalaryRunTimeException("未找到薪资档案"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542367, "未找到薪资档案")); } Date payStartDate = po.getPayStartDate(); Date payEndDate = stopSalaryParam.getPayEndDate(); if (payEndDate.before(payStartDate)) { - throw new SalaryRunTimeException("最后缴纳日期应大于起始缴纳日期"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542368, "最后缴纳日期应大于起始缴纳日期")); } po.setPayEndDate(payEndDate); @@ -770,17 +770,17 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe private void vaildImportParam(SalaryArchiveImportHandleParam param) { String imageId = param.getImageId(); if (StringUtils.isBlank(imageId)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100593, "文件id为空")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542369, "文件id为空")); } if (param.getListType() == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(109712, "列表类型必传")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542370, "列表类型必传")); } else { // 定薪列表导入有调薪导入和初始化导入 if (param.getListType().equals(SalaryArchiveListTypeEnum.FIXED.getValue())) { Optional optional = Arrays.stream(SalaryArchiveImportTypeEnum.values()) .filter(e -> StringUtils.isNotEmpty(param.getImportType()) && e.getValue().equals(param.getImportType())).findFirst(); if (!optional.isPresent()) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100593, "导入类型不正确")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542371, "导入类型不正确")); } } } @@ -900,7 +900,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe //固定列 map.put(SalaryI18nUtil.getI18nLabel(25034,"姓名"), "username"); map.put(SalaryI18nUtil.getI18nLabel(537996, "个税扣缴义务人"), "taxAgentName"); - map.put(SalaryI18nUtil.getI18nLabel(85904, "生效日期"), "taxAgentEffectiveTime"); + map.put(SalaryI18nUtil.getI18nLabel(19548, "生效日期"), "taxAgentEffectiveTime"); map.put(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), "departmentName"); map.put(SalaryI18nUtil.getI18nLabel(125238, "手机号"), "mobile"); map.put(SalaryI18nUtil.getI18nLabel(15890, "员工状态"), "employeeStatus"); @@ -908,7 +908,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe List salaryItems = salaryItemMapper.getCanAdjustSalaryItems(); if (isTaxAgentAdjust || isSalaryItemAdjust) { - map.put(SalaryI18nUtil.getI18nLabel(85431, "调整原因"), "adjustReason"); + map.put(SalaryI18nUtil.getI18nLabel(1897, "调整原因"), "adjustReason"); } //动态列 // 获取所有可被引用的薪资项目 @@ -1012,13 +1012,13 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe @Override public Map gotoFixed(Collection ids) { if (CollectionUtils.isEmpty(ids)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542372, "没有可以操作的记录")); } List salaryArchiveList = listSome(SalaryArchivePO.builder().ids(ids).runStatus(SalaryArchiveStatusEnum.PENDING.getValue()).build()); if (CollectionUtils.isEmpty(salaryArchiveList)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "薪资档案不存在！")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542356, "薪资档案不存在！")); } List unableList = salaryArchiveList.stream().filter(f -> f.getPayStartDate() == null).collect(Collectors.toList()); @@ -1027,7 +1027,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe int errorCount = unableList.size(); // 单个设为定薪的失败提示 if (total == 1 && errorCount > 0) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(109197, "请先维护起始发薪日期")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542373, "请先维护起始发薪日期")); } // 从待定薪到定薪 @@ -1050,13 +1050,13 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe partitions.forEach(list -> getSalaryArchiveItemMapper().batchUpdate(list)); Map resultMap = new HashMap<>(2); - String resultMsg = SalaryI18nUtil.getI18nLabel(94620, "操作成功"); + String resultMsg = SalaryI18nUtil.getI18nLabel(30700, "操作成功"); String resultType = "success"; // 批量设为定薪提示 if (total > 1) { - resultMsg = SalaryI18nUtil.getI18nLabel(134807, "成功条数") + ": " + (total - errorCount) + "; " - + SalaryI18nUtil.getI18nLabel(134808, "失败条数") + ": " + (errorCount) - + (errorCount > 0 ? ", " + SalaryI18nUtil.getI18nLabel(109197, "请先维护起始发薪日期") : ""); + resultMsg = SalaryI18nUtil.getI18nLabel(542374, "成功条数") + ": " + (total - errorCount) + "; " + + SalaryI18nUtil.getI18nLabel(542375, "失败条数") + ": " + (errorCount) + + (errorCount > 0 ? ", " + SalaryI18nUtil.getI18nLabel(542373, "请先维护起始发薪日期") : ""); resultType = errorCount > 0 ? "info" : resultType; } resultMap.put("type", resultType); @@ -1076,7 +1076,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe @Override public Map gotoStop(Collection ids) { if (CollectionUtils.isEmpty(ids)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "没有可以操作的记录")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542372, "没有可以操作的记录")); } List oldList = listSome(SalaryArchivePO.builder() .ids(ids) @@ -1084,7 +1084,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe .build()); if (CollectionUtils.isEmpty(oldList)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "薪资档案不存在！")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542356, "薪资档案不存在！")); } List unableList = oldList.stream().filter(f -> f.getPayEndDate() == null).collect(Collectors.toList()); @@ -1099,12 +1099,12 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe getSalaryArchiveMapper().gotoStop(ids); Map resultMap = new HashMap<>(2); - String resultMsg = SalaryI18nUtil.getI18nLabel(94620, "操作成功"); + String resultMsg = SalaryI18nUtil.getI18nLabel(30700, "操作成功"); String resultType = "success"; // 批量设为定薪提示 if (total > 1) { - resultMsg = SalaryI18nUtil.getI18nLabel(134807, "成功条数") + ": " + (total - errorCount) + "; " - + SalaryI18nUtil.getI18nLabel(134808, "失败条数") + ": " + (errorCount) + resultMsg = SalaryI18nUtil.getI18nLabel(542374, "成功条数") + ": " + (total - errorCount) + "; " + + SalaryI18nUtil.getI18nLabel(542375, "失败条数") + ": " + (errorCount) + (errorCount > 0 ? ", " + SalaryI18nUtil.getI18nLabel(109196, "请先维护最后发薪日期") : ""); resultType = errorCount > 0 ? "info" : resultType; } @@ -1145,11 +1145,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // 获取删除待停薪信息 List list = getSalaryArchiveMapper().list(SalaryArchiveQueryParam.builder().ids(ids).build()); if(list.size() != ids.size()){ - throw new SalaryRunTimeException("薪资档案不存在，删除失败！"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542376, "薪资档案不存在，删除失败！")); } Set employeeStatus = list.stream().map(SalaryArchiveListDTO::getEmployeeStatus).collect(Collectors.toSet()); if(employeeStatus.contains("5")){ - throw new SalaryRunTimeException("离职人员无法删除待办"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542377, "离职人员无法删除待办")); } Map taxAgentMap = SalaryEntityUtil.convert2Map(taxAgentList, TaxAgentManageRangeEmployeeDTO::getTaxAgentId); // 判断删除待停薪代办的人是否在个税扣缴义务人的人员范围中 @@ -1160,10 +1160,10 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe .map(TaxAgentManageRangeEmployeeDTO.TaxAgentEmployee::getEmployeeId) .anyMatch(id -> Objects.equals(id, dto.getEmployeeId())); if(!canDelete){ - throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内，删除失败！"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542378, "个税扣缴义务人不存在或不在权限范围内，删除失败！")); } }else{ - throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内，删除失败！"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542378, "个税扣缴义务人不存在或不在权限范围内，删除失败！")); } } // 删除最后发薪日期，设置状态为发薪 @@ -1187,7 +1187,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe if (CollectionUtils.isEmpty(oldList)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(145969, "薪资档案不存在！")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542356, "薪资档案不存在！")); } @@ -1195,7 +1195,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe List oldPendingList = oldList.stream().filter(f -> f.getRunStatus().equals(SalaryArchiveStatusEnum.STOP_FROM_PENDING.getValue())).collect(Collectors.toList()); boolean isNotExist = oldPendingList.stream().anyMatch(te -> taxAgentManageRangeEmployees.stream().noneMatch(p -> p.getEmployeeId() != null && p.getEmployeeId().equals(te.getEmployeeId()) && p.getTaxAgentId().equals(te.getTaxAgentId()))); if (isNotExist) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(116196, "不在当前个税扣缴义人的人员范围中，不可取消停薪")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542379, "不在当前个税扣缴义人的人员范围中，不可取消停薪")); } // 从停薪到待定薪 getSalaryArchiveMapper().gotoPendingFromStop(ids); diff --git a/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java index 41fbb49b6..c265a9dee 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveTaxAgentServiceImpl.java @@ -123,29 +123,29 @@ public class SalaryArchiveTaxAgentServiceImpl extends Service implements SalaryA Date effectiveTime = effectiveTaxAgent.getEffectiveTime(); // 1.1 如果早于<当前已生效 if (saveEffectiveTime.before(effectiveTime)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100429, "生效日期不可早于当前已生效的调整日期")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542357, "生效日期不可早于当前已生效的调整日期")); // 1.2 如果等于当前已生效 } else if (saveEffectiveTime.equals(effectiveTime)) { if (CollectionUtils.isNotEmpty(salaryArchiveTaxAgents) && salaryArchiveTaxAgents.get(0).getTaxAgentId().equals(saveParam.getTaxAgentId())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100432, "调整前后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542358, "调整前后不可相同")); } if (ineffectiveTaxAgent != null && ineffectiveTaxAgent.getTaxAgentId().equals(saveParam.getTaxAgentId())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542359, "与未生效的调整后不可相同")); } // 1.3 如果>已经生效且<=今天 } else if (saveEffectiveTime.after(effectiveTime) && !saveEffectiveTime.after(today)) { if (effectiveTaxAgent.getTaxAgentId().equals(saveParam.getTaxAgentId())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100432, "调整前后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542358, "调整前后不可相同")); } if (ineffectiveTaxAgent != null && ineffectiveTaxAgent.getTaxAgentId().equals(saveParam.getTaxAgentId())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542359, "与未生效的调整后不可相同")); } // 1.4 如果>今天 } else if (saveEffectiveTime.after(today) && effectiveTaxAgent.getTaxAgentId().equals(saveParam.getTaxAgentId())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100432, "调整前后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542358, "调整前后不可相同")); } } else if (ineffectiveTaxAgent != null && ineffectiveTaxAgent.getTaxAgentId().equals(saveParam.getTaxAgentId())) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100434, "与未生效的调整后不可相同")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542359, "与未生效的调整后不可相同")); } // 2.数据处理 // 2.数据处理,有的就先删后增 @@ -194,19 +194,19 @@ public class SalaryArchiveTaxAgentServiceImpl extends Service implements SalaryA @Override public XSSFWorkbook exportAdjustRecordList(TaxAgentAdjustRecordQueryParam queryParam) { // 1.工作簿名称 - String sheetName = SalaryI18nUtil.getI18nLabel(99978, "个税扣缴义务人调整记录"); + String sheetName = SalaryI18nUtil.getI18nLabel(542380, "个税扣缴义务人调整记录"); // 2.表头 List header = new ArrayList<>(); header.add(SalaryI18nUtil.getI18nLabel(25034, "姓名")); header.add(SalaryI18nUtil.getI18nLabel(15890, "员工状态")); header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门")); - header.add(SalaryI18nUtil.getI18nLabel(85433, "调整前")); - header.add(SalaryI18nUtil.getI18nLabel(85434, "调整后")); - header.add(SalaryI18nUtil.getI18nLabel(85431, "调整原因")); - header.add(SalaryI18nUtil.getI18nLabel(85904, "生效日期")); - header.add(SalaryI18nUtil.getI18nLabel(85435, "操作人")); - header.add(SalaryI18nUtil.getI18nLabel(85436, "操作时间")); - header.add(SalaryI18nUtil.getI18nLabel(84961, "备注")); + header.add(SalaryI18nUtil.getI18nLabel(130510, "调整前")); + header.add(SalaryI18nUtil.getI18nLabel(130511, "调整后")); + header.add(SalaryI18nUtil.getI18nLabel(1897, "调整原因")); + header.add(SalaryI18nUtil.getI18nLabel(19548, "生效日期")); + header.add(SalaryI18nUtil.getI18nLabel(17482, "操作人")); + header.add(SalaryI18nUtil.getI18nLabel(18008, "操作时间")); + header.add(SalaryI18nUtil.getI18nLabel(536726, "备注")); // 3.表数据 // 获取记录 List list = getSalaryArchiveTaxAgentMapper().taxAgentAdjustRecordList(queryParam); diff --git a/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java index 8d99c24da..5f8dc424c 100644 --- a/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java @@ -133,7 +133,7 @@ public class SalaryComparisonResultServiceImpl extends Service implements Salary // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(queryParam.getSalaryAcctRecordId()); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 查询薪资核算所用薪资账套 SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId()); @@ -150,7 +150,7 @@ public class SalaryComparisonResultServiceImpl extends Service implements Salary Map expressFormulaMap = SalaryEntityUtil.convert2Map(expressFormulas, ExpressFormula::getId, ExpressFormula::getFormula); Map customParameters = SalaryEntityUtil.convert2Map(salarySobItemPOS, SalarySobItemPO::getSalaryItemId, salarySobItemPO -> { if (salarySobItemPO.getFormulaId() <= 0) { - return SalaryI18nUtil.getI18nLabel(92004, "输入/导入"); + return SalaryI18nUtil.getI18nLabel(542339, "输入/导入"); } return expressFormulaMap.getOrDefault(salarySobItemPO.getFormulaId(), StringUtils.EMPTY); }); diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java index 658f364d0..2ef57f36e 100644 --- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java @@ -197,7 +197,7 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService // 查询薪资项目，判断薪资项目是否存在 SalaryItemPO salaryItemPO = getById(saveParam.getId()); if (Objects.isNull(salaryItemPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "参数错误，薪资项目不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542360, "参数错误，薪资项目不存在或已被删除")); } // 名称不能和已有的自定义薪资项目重名 List salaryItemPOS = listByName(saveParam.getName()); @@ -287,7 +287,7 @@ public class SalaryItemServiceImpl extends Service implements SalaryItemService // 查询薪资项目 List salaryItemPOS = listByIds(ids); if (CollectionUtils.isEmpty(salaryItemPOS)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "参数错误，薪资项目不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542360, "参数错误，薪资项目不存在或已被删除")); } if (CollectionUtils.containsAny(usingItemIds, ids)) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98322, "薪资账套正在使用该薪资项目，不允许删除")); diff --git a/src/com/engine/salary/service/impl/SalarySobBackItemServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobBackItemServiceImpl.java index 928c3566e..9f42f77e8 100644 --- a/src/com/engine/salary/service/impl/SalarySobBackItemServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobBackItemServiceImpl.java @@ -78,7 +78,7 @@ public class SalarySobBackItemServiceImpl extends Service implements SalarySobBa // 查询薪资账套是否存在 SalarySobPO salarySobPO = getSalarySobService(user).getById(saveParam.getSalarySobId()); if (Objects.isNull(salarySobPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98769, "薪资账套不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542303, "薪资账套不存在或已被删除")); } // 查询薪资账套下的回算薪资项目 SalarySobBackItemPO salarySobBackItem = getById(saveParam.getId()); diff --git a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java index 3251f62d0..f0dd9eb09 100644 --- a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java @@ -500,7 +500,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd @Override public List getSpecialAddDeductionList(YearMonth declareMonth, List employeeIds, Long taxAgentId) { if (declareMonth == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100342, "参数有误：申报月份必传")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542297, "参数有误：申报月份必传")); } SpecialAddDeductionBiz SpecialAddDeductionBiz = new SpecialAddDeductionBiz(); return SpecialAddDeductionBiz.listByTaxAgentIds(null); diff --git a/src/com/engine/salary/web/OtherDeductionController.java b/src/com/engine/salary/web/OtherDeductionController.java index 60a2cea41..bcadbcdc9 100644 --- a/src/com/engine/salary/web/OtherDeductionController.java +++ b/src/com/engine/salary/web/OtherDeductionController.java @@ -7,6 +7,7 @@ import com.engine.salary.entity.datacollection.dto.OtherDeductionRecordDTO; import com.engine.salary.entity.datacollection.param.*; import com.engine.salary.util.ResponseResult; import com.engine.salary.util.SalaryDateUtil; +import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.wrapper.OtherDeductionWrapper; import io.swagger.v3.oas.annotations.parameters.RequestBody; @@ -95,7 +96,7 @@ public class OtherDeductionController { OtherDeductionQueryParam param = buildParam(request); XSSFWorkbook workbook = getOtherDeductionWrapper(user).downloadTemplate(param); - String fileName = "其他免税扣除导入模板" + LocalDate.now(); + String fileName = SalaryI18nUtil.getI18nLabel(542298, "其他免税扣除导入模板") + LocalDate.now(); try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); } catch (UnsupportedEncodingException e) { @@ -135,7 +136,7 @@ public class OtherDeductionController { String fileName = null; try { - fileName = URLEncoder.encode("其他免税扣除" + LocalDate.now() + ".xlsx", "UTF-8"); + fileName = URLEncoder.encode(SalaryI18nUtil.getI18nLabel(538007, "其他免税扣除") + LocalDate.now() + ".xlsx", "UTF-8"); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } @@ -167,7 +168,7 @@ public class OtherDeductionController { XSSFWorkbook workbook = getOtherDeductionWrapper(user).exportDetail(param); - String fileName = "其他免税扣除明细" + LocalDate.now(); + String fileName = SalaryI18nUtil.getI18nLabel(542296,"其他免税扣除明细") + LocalDate.now(); try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); } catch (UnsupportedEncodingException e) { diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java index 05b93492d..5f55168b3 100644 --- a/src/com/engine/salary/web/SalaryAcctController.java +++ b/src/com/engine/salary/web/SalaryAcctController.java @@ -10,6 +10,7 @@ import com.engine.salary.service.SalaryAcctExcelService; import com.engine.salary.service.impl.SalaryAcctExcelServiceImpl; import com.engine.salary.util.ResponseResult; import com.engine.salary.util.SalaryDateUtil; +import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.page.PageInfo; import com.engine.salary.wrapper.*; import io.swagger.v3.oas.annotations.parameters.RequestBody; @@ -256,7 +257,7 @@ public class SalaryAcctController { User user = HrmUserVarify.getUser(request, response); XSSFWorkbook workbook = getSalaryAcctExcelWrapper(user).exportSalaryAcctEmployee(param); String time = LocalDate.now().toString(); - String fileName = "核算人员范围" + time; + String fileName = SalaryI18nUtil.getI18nLabel(542307, "核算人员范围") + time; try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); } catch (UnsupportedEncodingException e) { @@ -325,7 +326,7 @@ public class SalaryAcctController { User user = HrmUserVarify.getUser(request, response); XSSFWorkbook workbook = getSalaryAcctExcelWrapper(user).exportReducedEmployee(param); String time = LocalDate.now().toString(); - String fileName = "环比上月减少人员" + time; + String fileName = SalaryI18nUtil.getI18nLabel(542308, "环比上月减少人员") + time; try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); } catch (UnsupportedEncodingException e) { @@ -356,7 +357,7 @@ public class SalaryAcctController { User user = HrmUserVarify.getUser(request, response); XSSFWorkbook workbook = getSalaryAcctExcelWrapper(user).exportAddedEmployee(param); String time = LocalDate.now().toString(); - String fileName = "环比上月增加人员" + time; + String fileName = SalaryI18nUtil.getI18nLabel(542309, "环比上月增加人员") + time; try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); } catch (UnsupportedEncodingException e) { @@ -463,7 +464,7 @@ public class SalaryAcctController { setSalaryAcctResultQueryParam(request, param); User user = HrmUserVarify.getUser(request, response); XSSFWorkbook workbook = getSalaryAcctExcelWrapper(user).exportSalaryAcctResult(param); - String fileName = "薪资核算结果" + LocalDate.now(); + String fileName = SalaryI18nUtil.getI18nLabel(542310, "薪资核算结果") + LocalDate.now(); try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); } catch (UnsupportedEncodingException e) { @@ -521,7 +522,7 @@ public class SalaryAcctController { User user = HrmUserVarify.getUser(request, response); XSSFWorkbook workbook = getSalaryAcctExcelWrapper(user).exportImportTemplate(param); String time = LocalDate.now().toString(); - String fileName = "薪资核算导入模板" + time; + String fileName = SalaryI18nUtil.getI18nLabel(542312, "薪资核算导入模板") + time; try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); } catch (UnsupportedEncodingException e) { @@ -666,7 +667,7 @@ public class SalaryAcctController { User user = HrmUserVarify.getUser(request, response); XSSFWorkbook workbook = getSalaryAcctExcelWrapper(user).exportComparisonResult(param); String time = LocalDate.now().toString(); - String fileName = "线下对比结果" + time; + String fileName = SalaryI18nUtil.getI18nLabel(542315, "线下对比结果") + time; try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); } catch (UnsupportedEncodingException e) { @@ -738,7 +739,7 @@ public class SalaryAcctController { User user = HrmUserVarify.getUser(request, response); XSSFWorkbook workbook = getSalaryAcctExcelWrapper(user).exportComparisonResultTemplate(param); String time = LocalDate.now().toString(); - String fileName = "线下对比结果导入模板" + time; + String fileName = SalaryI18nUtil.getI18nLabel(542316, "线下对比结果导入模板") + time; try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); } catch (UnsupportedEncodingException e) { diff --git a/src/com/engine/salary/web/SalaryArchiveController.java b/src/com/engine/salary/web/SalaryArchiveController.java index 6c6d8b398..a18c6cbb7 100644 --- a/src/com/engine/salary/web/SalaryArchiveController.java +++ b/src/com/engine/salary/web/SalaryArchiveController.java @@ -272,7 +272,7 @@ public class SalaryArchiveController { XSSFWorkbook workbook = getSalaryArchiveWrapper(user).exportList(queryParam); - String fileName = "薪资档案" + LocalDate.now(); + String fileName = SalaryI18nUtil.getI18nLabel(538004, "薪资档案") + LocalDate.now(); try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); } catch (UnsupportedEncodingException e) { @@ -400,7 +400,7 @@ public class SalaryArchiveController { boolean isInit = SalaryArchiveImportTypeEnum.INIT.getValue().equals(queryParam.getImportType()); boolean isSalaryItemAdjust = SalaryArchiveImportTypeEnum.SALARYITEMADJUST.getValue().equals(queryParam.getImportType()); // 名称 - String finalNameI18n = SalaryI18nUtil.getI18nLabel(101601, "薪资档案导入模板") + "-" + String finalNameI18n = SalaryI18nUtil.getI18nLabel(542344, "薪资档案导入模板") + "-" + SalaryI18nUtil.getI18nLabel(listTypeEnum.getLabelId(), listTypeEnum.getDefaultLabel()); if (isFixedList) { // 初始化 @@ -766,7 +766,7 @@ public class SalaryArchiveController { XSSFWorkbook workbook = getSalaryArchiveItemWrapper(user).exportAdjustRecordList(param); - String fileName = "薪资项目调整记录" + LocalDate.now(); + String fileName = SalaryI18nUtil.getI18nLabel(542361, "薪资项目调整记录") + LocalDate.now(); try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); @@ -905,7 +905,7 @@ public class SalaryArchiveController { XSSFWorkbook workbook = getSalaryArchiveTaxAgentWrapper(user).exportAdjustRecordList(param); - String fileName = "个税扣缴义务人调整记录" + LocalDate.now(); + String fileName = SalaryI18nUtil.getI18nLabel(542380, "个税扣缴义务人调整记录") + LocalDate.now(); try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); diff --git a/src/com/engine/salary/web/SalarySobController.java b/src/com/engine/salary/web/SalarySobController.java index 4fcb12ea1..819306a96 100644 --- a/src/com/engine/salary/web/SalarySobController.java +++ b/src/com/engine/salary/web/SalarySobController.java @@ -224,7 +224,7 @@ public class SalarySobController { User user = HrmUserVarify.getUser(request, response); SalarySobPO salarySobPO = Objects.isNull(salarySobId) ? null : getSalarySobWrapper(user).getSalarySobService(user).getById(salarySobId); if(Objects.isNull(salarySobPO)){ - throw new SalaryRunTimeException("薪资账套不存在或已被删除"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542303, "薪资账套不存在或已被删除")); } try { XSSFWorkbook workbook = getSalarySobRangeWrapper(user).exportImportTemplate(); diff --git a/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java index 66f83facf..b5b29148f 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java @@ -140,12 +140,12 @@ public class SalaryAcctRecordWrapper extends Service implements SalaryAcctRecord // 查询薪资核算 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(id); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 查询薪资账套 SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId()); if (Objects.isNull(salarySobPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98769, "薪资账套不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542303, "薪资账套不存在或已被删除")); } // 转换成薪资核算记录详情dto formDTO.setId(salaryAcctRecordPO.getId()) diff --git a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java index 1b4a210fd..62865f87d 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java @@ -88,7 +88,7 @@ public class SalaryAcctResultWrapper extends Service { // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(queryParam.getSalaryAcctRecordId()); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 查询薪资核算结果（分页） @@ -141,7 +141,7 @@ public class SalaryAcctResultWrapper extends Service { // 查询薪资核算记录 SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(queryParam.getSalaryAcctRecordId()); if (Objects.isNull(salaryAcctRecordPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542300, "薪资核算记录不存在或已被删除")); } // 查询薪资核算结果 @@ -231,8 +231,8 @@ public class SalaryAcctResultWrapper extends Service { } // 初始化进度 SalaryAcctProgressDTO initProgress = new SalaryAcctProgressDTO() - .setTitle(SalaryI18nUtil.getI18nLabel(97515, "核算中")) - .setTitleLabelId(97515L) + .setTitle(SalaryI18nUtil.getI18nLabel(542322, "核算中")) + .setTitleLabelId(542322L) .setTotalQuantity(NumberUtils.INTEGER_ONE) .setCalculatedQuantity(NumberUtils.INTEGER_ZERO) .setProgress(BigDecimal.ZERO) diff --git a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java index 49d527a06..29bc6f52d 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java @@ -85,9 +85,9 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt Map map = new HashMap<>(); // 表头 List columns = new ArrayList<>(); - columns.add(SalaryI18nUtil.getI18nLabel(84960, "薪资项目")); - columns.add(SalaryI18nUtil.getI18nLabel(85433, "调整前")); - columns.add(SalaryI18nUtil.getI18nLabel(85434, "调整后")); + columns.add(SalaryI18nUtil.getI18nLabel(542362, "薪资项目")); + columns.add(SalaryI18nUtil.getI18nLabel(130510, "调整前")); + columns.add(SalaryI18nUtil.getI18nLabel(130511, "调整后")); // 获取所有可被引用的薪资项目 List salaryItemList = getSalaryArchiveItemService(user).getCanAdjustSalaryItems(); Set taxAgentIds = getTaxAgentService(user).listAllTaxAgents((long) user.getUID()) @@ -144,7 +144,7 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt } SalaryArchiveItemPO salaryArchiveItem = getSalaryArchiveItemService(user).getById(salaryArchiveItemId); if (salaryArchiveItem == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100428, "该薪资档案的薪资项目的调整记录不存在")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542352 , "该薪资档案的薪资项目的调整记录不存在")); } Long salaryArchiveId = salaryArchiveItem.getSalaryArchiveId(); Date effectiveTime; @@ -243,7 +243,7 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt */ public PageInfo singleSalaryItemAdjustRecordList(SingleSalaryItemAdjustRecordQueryParam queryParam) { if (queryParam.getSalaryArchiveId() == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100425, "薪资档案id不能为空")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542363, "薪资档案id不能为空")); } // 获取所有可被引用的薪资项目 List salaryItemList = getSalaryArchiveItemService(user).getCanAdjustSalaryItems(); diff --git a/src/com/engine/salary/wrapper/SalaryArchiveTaxAgentWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveTaxAgentWrapper.java index 69b7a509f..1f66e2239 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveTaxAgentWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveTaxAgentWrapper.java @@ -59,7 +59,7 @@ public class SalaryArchiveTaxAgentWrapper extends Service { */ public SalaryArchiveTaxAgentFormDTO getTaxAgentForm(Long salaryArchiveId) { if (salaryArchiveId == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100425, "薪资档案id不能为空")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542363, "薪资档案id不能为空")); } // 调整前 @@ -198,7 +198,7 @@ public class SalaryArchiveTaxAgentWrapper extends Service { */ public PageInfo singleTaxAgentAdjustRecordList(SingleTaxAgentAdjustRecordQueryParam queryParam) { if (queryParam.getSalaryArchiveId() == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100425, "薪资档案id不能为空")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542363, "薪资档案id不能为空")); } TaxAgentAdjustRecordQueryParam adjustRecordQueryParam = new TaxAgentAdjustRecordQueryParam(); diff --git a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java index 2f9139202..cfee52275 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java @@ -313,11 +313,11 @@ public class SalaryArchiveWrapper extends Service { */ public SalaryArchiveFormDTO getFrom(Long salaryArchiveId) { if (salaryArchiveId == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100425, "薪资档案id不能为空")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542363, "薪资档案id不能为空")); } SalaryArchivePO po = getSalaryArchiveService(user).getById(salaryArchiveId); if (po == null) { - throw new SalaryRunTimeException(String.format(SalaryI18nUtil.getI18nLabel(100463, "薪资档案不存在！") + "[id:%s]", salaryArchiveId)); + throw new SalaryRunTimeException(String.format(SalaryI18nUtil.getI18nLabel(542356, "薪资档案不存在！") + "[id:%s]", salaryArchiveId)); } List employeeList = employeeService.getEmployeeByIdsAll(Collections.singletonList(po.getEmployeeId())); @@ -427,14 +427,14 @@ public class SalaryArchiveWrapper extends Service { */ public XSSFWorkbook downloadTemplate(SalaryArchiveQueryParam queryParam) { if (queryParam.getListType() == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(109712, "列表类型必传")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542370, "列表类型必传")); } else { // 定薪列表导入有调薪导入和初始化导入 if (queryParam.getListType().equals(SalaryArchiveListTypeEnum.FIXED.getValue())) { Optional optional = Arrays.stream(SalaryArchiveImportTypeEnum.values()) .filter(e -> StringUtils.isNotEmpty(queryParam.getImportType()) && e.getValue().equals(queryParam.getImportType())).findFirst(); if (!optional.isPresent()) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100593, "导入类型不正确")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542371, "导入类型不正确")); } } } @@ -559,7 +559,7 @@ public class SalaryArchiveWrapper extends Service { } List list = getSalaryArchiveService(user).listSome(po); if (CollectionUtils.isEmpty(list)) { - throw new SalaryRunTimeException("薪资档案不存在！"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542356, "薪资档案不存在！")); } if (list.size() > 1) { throw new SalaryRunTimeException("存在多个薪资档案！"); diff --git a/src/com/engine/salary/wrapper/SalaryFieldWrapper.java b/src/com/engine/salary/wrapper/SalaryFieldWrapper.java index ee0880e74..51d1350fb 100644 --- a/src/com/engine/salary/wrapper/SalaryFieldWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryFieldWrapper.java @@ -134,7 +134,7 @@ public class SalaryFieldWrapper extends Service { SalaryItemPO salaryItemPO = getSalaryItemService(user).getById(id); // 系统薪资项目 if (Objects.isNull(salaryItemPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "参数错误，薪资项目不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542360, "参数错误，薪资项目不存在或已被删除")); } ExpressFormula expressFormula; // // 转换成薪资项目详情dto diff --git a/src/com/engine/salary/wrapper/SalaryItemWrapper.java b/src/com/engine/salary/wrapper/SalaryItemWrapper.java index 3a03a30d3..0444543db 100644 --- a/src/com/engine/salary/wrapper/SalaryItemWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryItemWrapper.java @@ -168,7 +168,7 @@ public class SalaryItemWrapper extends Service { // 系统薪资项目 SysSalaryItemPO sysSalaryItemPO = getSysSalaryItemService(user).getById(id); if (Objects.isNull(salaryItemPO) && Objects.isNull(sysSalaryItemPO)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98299, "参数错误，薪资项目不存在或已被删除")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(542360, "参数错误，薪资项目不存在或已被删除")); } ExpressFormula expressFormula; // // 转换成薪资项目详情dto diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java index a0b7c55da..addb383e1 100644 --- a/src/com/engine/salary/wrapper/SalarySendWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java @@ -175,7 +175,7 @@ public class SalarySendWrapper extends Service { WeaTableColumn idColumn = new WeaTableColumn("0px", "id", "id"); idColumn.setDisplay(WeaBoolAttr.FALSE); list.add(new WeaTableColumn("10%", "薪资所属月", "salaryYearMonth")); - list.add(new WeaTableColumn("35%", "薪资账套", "salarySob")); + list.add(new WeaTableColumn("35%", SalaryI18nUtil.getI18nLabel(538010, "薪资账套"), "salarySob")); list.add(new WeaTableColumn("25%", "次数", "acctTimes")); list.add(new WeaTableColumn("25%", "工资单模板", "template")); list.add(new WeaTableColumn("15%", "已发放", "sendSituation")); @@ -262,7 +262,7 @@ public class SalarySendWrapper extends Service { status.setOptions(userStatusOptions); status.setInputType(""); status.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 - status.setLabel("状态"); //设置文本值 这个将覆盖多语言标签的值 + status.setLabel(SalaryI18nUtil.getI18nLabel(535101, "状态")); //设置文本值 这个将覆盖多语言标签的值 conditionItems.add(status); //发送状态 @@ -430,7 +430,7 @@ public class SalarySendWrapper extends Service { status.setOptions(userStatusOptions); status.setInputType(""); status.setViewAttr(2); // 编辑权限 1：只读，2：可编辑， 3：必填 默认2 - status.setLabel("状态"); //设置文本值 这个将覆盖多语言标签的值 + status.setLabel(SalaryI18nUtil.getI18nLabel(535101, "状态")); //设置文本值 这个将覆盖多语言标签的值 conditionItems.add(status); // //入职日期