diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctCalculatePriorityBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctCalculatePriorityBO.java index 197ad1245..48f2e6fb4 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctCalculatePriorityBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctCalculatePriorityBO.java @@ -195,9 +195,12 @@ public class SalaryAcctCalculatePriorityBO { if (Objects.equals(pre.getSalaryItemId(), current.getSalaryItemId())) { SalaryItemPO preSalaryItemPO = salaryItemPOMap.get(pre.getSalaryItemId()); SalaryItemPO currentSalaryItemPO = salaryItemPOMap.get(current.getSalaryItemId()); - String errMsg = SalaryI18nUtil.getI18nLabel(101426, "{0}和{1}的公式中存在相互引用") + String errMsg = SalaryI18nUtil.getI18nLabel(101426, "以下项目的公式中存在相互引用") + ":{0}、{1}" .replace("{0}", Optional.ofNullable(preSalaryItemPO).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY)) .replace("{1}", Optional.ofNullable(currentSalaryItemPO).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY)); +// String errMsg = SalaryI18nUtil.getI18nLabel(101426, "{0}和{1}的公式中存在相互引用") +// .replace("{0}", Optional.ofNullable(preSalaryItemPO).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY)) +// .replace("{1}", Optional.ofNullable(currentSalaryItemPO).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY)); throw new SalaryRunTimeException(errMsg); } if (CollectionUtils.isEmpty(pre.getPreList())) { diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java index e84a890ee..37b92c450 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobBO.java @@ -95,26 +95,58 @@ public class SalarySobBO { Integer salaryCycleFromDay = salarySobPO.getSalaryCycleFromDay(); switch (salaryCycleTypeEnum) { case BEFORE_LAST_MONTH: - salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) ? SalaryI18nUtil.getI18nLabel(98395, "上上月1号——上上月最后一天") - : SalaryI18nUtil.getI18nLabel(98399, "上上月{0}号——上月{1}号") +// salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) ? SalaryI18nUtil.getI18nLabel(98395, "上上月1号——上上月最后一天") +// : SalaryI18nUtil.getI18nLabel(98399, "上上月{0}号——上月{1}号") +// .replace("{0}", "" + salaryCycleFromDay) +// .replace("{1}", "" + (salaryCycleFromDay - 1)); + + salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) + ? SalaryI18nUtil.getI18nLabel(98395, "上上个月") + "-" + "第一天" + "——" + + SalaryI18nUtil.getI18nLabel(98395, "上上个月") + "-" + SalaryI18nUtil.getI18nLabel(98395, "最后一天") + : SalaryI18nUtil.getI18nLabel(98399, "上上个月") + "-{0}——" + + SalaryI18nUtil.getI18nLabel(98399, "上个月") + "-{1}" .replace("{0}", "" + salaryCycleFromDay) .replace("{1}", "" + (salaryCycleFromDay - 1)); break; case LAST_MONTH: - salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) ? SalaryI18nUtil.getI18nLabel(98396, "上月1号——上月最后一天") - : SalaryI18nUtil.getI18nLabel(98400, "上月{0}号——本月{1}号") +// salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) ? SalaryI18nUtil.getI18nLabel(98396, "上月1号——上月最后一天") +// : SalaryI18nUtil.getI18nLabel(98400, "上月{0}号——本月{1}号") +// .replace("{0}", "" + salaryCycleFromDay) +// .replace("{1}", "" + (salaryCycleFromDay - 1)); + + salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) + ? SalaryI18nUtil.getI18nLabel(98395, "上个月") + "-" + "第一天" + "——" + + SalaryI18nUtil.getI18nLabel(98395, "上个月") + "-" + SalaryI18nUtil.getI18nLabel(98395, "最后一天") + : SalaryI18nUtil.getI18nLabel(98400, "上个月") + "-{0}——" + + SalaryI18nUtil.getI18nLabel(98400, "本月") + "-{1}" .replace("{0}", "" + salaryCycleFromDay) .replace("{1}", "" + (salaryCycleFromDay - 1)); break; case THIS_MONTH: - salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) ? SalaryI18nUtil.getI18nLabel(98397, "本月1号——本月最后一天") - : SalaryI18nUtil.getI18nLabel(98401, "本月{0}号——下月{1}号") +// salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) ? SalaryI18nUtil.getI18nLabel(98397, "本月1号——本月最后一天") +// : SalaryI18nUtil.getI18nLabel(98401, "本月{0}号——下月{1}号") +// .replace("{0}", "" + salaryCycleFromDay) +// .replace("{1}", "" + (salaryCycleFromDay - 1)); + + salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) + ? SalaryI18nUtil.getI18nLabel(98395, "本月") + "-" + "第一天" + "——" + + SalaryI18nUtil.getI18nLabel(98395, "本月") + "-" + SalaryI18nUtil.getI18nLabel(98395, "最后一天") + : SalaryI18nUtil.getI18nLabel(98401, "本月") + "-{0}——" + + SalaryI18nUtil.getI18nLabel(98401, "下个月") + "-{1}" .replace("{0}", "" + salaryCycleFromDay) .replace("{1}", "" + (salaryCycleFromDay - 1)); break; case NEXT_MONTH: - salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) ? SalaryI18nUtil.getI18nLabel(98398, "下月1号——下月最后一天") - : SalaryI18nUtil.getI18nLabel(98402, "下月{0}号——下下月{1}号") +// salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) ? SalaryI18nUtil.getI18nLabel(98398, "下月1号——下月最后一天") +// : SalaryI18nUtil.getI18nLabel(98402, "下月{0}号——下下月{1}号") +// .replace("{0}", "" + salaryCycleFromDay) +// .replace("{1}", "" + (salaryCycleFromDay - 1)); + + salaryCycleStr = Objects.equals(salaryCycleFromDay, 1) + ? SalaryI18nUtil.getI18nLabel(98395, "下个月") + "-" + "第一天" + "——" + + SalaryI18nUtil.getI18nLabel(98395, "下个月") + "-" + SalaryI18nUtil.getI18nLabel(98395, "最后一天") + : SalaryI18nUtil.getI18nLabel(98402, "下个月") + "-{0}——" + + SalaryI18nUtil.getI18nLabel(98402, "下下个月") + "-{1}" .replace("{0}", "" + salaryCycleFromDay) .replace("{1}", "" + (salaryCycleFromDay - 1)); break; diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java index 921fad01c..40379477e 100644 --- a/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java +++ b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java @@ -38,7 +38,7 @@ public class SalarySobPO { */ private Integer incomeCategory; /** - * 薪资周期。1:上上月、2:上月、3:本月、4:下月 + * 薪资周期。1:上上个月、2:上个月、3:本月、4:下个月 */ private Integer salaryCycleType; /** @@ -46,11 +46,11 @@ public class SalarySobPO { */ private Integer salaryCycleFromDay; /** - * 税款所属期。1:上上月、2:上月、3:本月、4:下月 + * 税款所属期。1:上上个月、2:上个月、3:本月、4:下个月 */ private Integer taxCycleType; /** - * 考勤周期。1:上上月、2:上月、3:本月、4:下月 + * 考勤周期。1:上上个月、2:上个月、3:本月、4:下个月 */ private Integer attendCycleType; /** @@ -58,7 +58,7 @@ public class SalarySobPO { */ private Integer attendCycleFromDay; /** - * 社保福利所属期。1:上上月、2:上月、3:本月、4:下月 + * 社保福利所属期。1:上上个月、2:上个月、3:本月、4:下个月 */ private Integer socialSecurityCycleType; /** diff --git a/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailListColumn.java b/src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationDetailListColumn.java index 0664942dc..a246b72b9 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(102786, "收入所得项目"), SalaryI18nUtil.getI18nLabel(96689, "收入"), SalaryI18nUtil.getI18nLabel(102789, "费用"), SalaryI18nUtil.getI18nLabel(102790, "免税收入"), diff --git a/src/com/engine/salary/enums/SalaryCycleTypeEnum.java b/src/com/engine/salary/enums/SalaryCycleTypeEnum.java index 9def3061a..01b55f381 100644 --- a/src/com/engine/salary/enums/SalaryCycleTypeEnum.java +++ b/src/com/engine/salary/enums/SalaryCycleTypeEnum.java @@ -13,10 +13,10 @@ import java.util.Objects; **/ public enum SalaryCycleTypeEnum implements BaseEnum { - BEFORE_LAST_MONTH(1, "上上月", 86075), - LAST_MONTH(2, "上月", 86074), + BEFORE_LAST_MONTH(1, "上上个月", 86075), + LAST_MONTH(2, "上个月", 86074), THIS_MONTH(3, "本月", 86072), - NEXT_MONTH(4, "下月", 86073); + NEXT_MONTH(4, "下个月", 86073); private int value; diff --git a/src/com/engine/salary/transmethod/TransMethod.java b/src/com/engine/salary/transmethod/TransMethod.java index 1344fe6be..686005884 100644 --- a/src/com/engine/salary/transmethod/TransMethod.java +++ b/src/com/engine/salary/transmethod/TransMethod.java @@ -109,26 +109,54 @@ public class TransMethod { } switch (salaryCycleTypeEnum) { case BEFORE_LAST_MONTH: - salaryCycleStr = Objects.equals(salaryCycleFromDay, "1") ? SalaryI18nUtil.getI18nLabel(98395, "上上月1号——上上月最后一天") - : SalaryI18nUtil.getI18nLabel(98399, "上上月{0}号——上月{1}号") +// salaryCycleStr = Objects.equals(salaryCycleFromDay, "1") ? SalaryI18nUtil.getI18nLabel(98395, "上上月1号——上上月最后一天") +// : SalaryI18nUtil.getI18nLabel(98399, "上上月{0}号——上月{1}号") +// .replace("{0}", "" + salaryCycleFromDay) +// .replace("{1}", "" + (Integer.parseInt(salaryCycleFromDay) - 1)); + salaryCycleStr = Objects.equals(salaryCycleFromDay, "1") + ? SalaryI18nUtil.getI18nLabel(98395, "上上个月") + "-" + "第一天" + "——" + + SalaryI18nUtil.getI18nLabel(98395, "上上个月") + "-" + SalaryI18nUtil.getI18nLabel(98395, "最后一天") + : SalaryI18nUtil.getI18nLabel(98399, "上上个月") + "-{0}——" + + SalaryI18nUtil.getI18nLabel(98399, "上个月") + "-{1}" .replace("{0}", "" + salaryCycleFromDay) .replace("{1}", "" + (Integer.parseInt(salaryCycleFromDay) - 1)); break; case LAST_MONTH: - salaryCycleStr = Objects.equals(salaryCycleFromDay, "1") ? SalaryI18nUtil.getI18nLabel(98396, "上月1号——上月最后一天") - : SalaryI18nUtil.getI18nLabel(98400, "上月{0}号——本月{1}号") +// salaryCycleStr = Objects.equals(salaryCycleFromDay, "1") ? SalaryI18nUtil.getI18nLabel(98396, "上月1号——上月最后一天") +// : SalaryI18nUtil.getI18nLabel(98400, "上月{0}号——本月{1}号") +// .replace("{0}", "" + salaryCycleFromDay) +// .replace("{1}", "" + (Integer.parseInt(salaryCycleFromDay) - 1)); + salaryCycleStr = Objects.equals(salaryCycleFromDay, "1") + ? SalaryI18nUtil.getI18nLabel(98395, "上个月") + "-" + "第一天" + "——" + + SalaryI18nUtil.getI18nLabel(98395, "上个月") + "-" + SalaryI18nUtil.getI18nLabel(98395, "最后一天") + : SalaryI18nUtil.getI18nLabel(98400, "上个月") + "-{0}——" + + SalaryI18nUtil.getI18nLabel(98400, "本月") + "-{1}" .replace("{0}", "" + salaryCycleFromDay) .replace("{1}", "" + (Integer.parseInt(salaryCycleFromDay) - 1)); break; case THIS_MONTH: - salaryCycleStr = Objects.equals(salaryCycleFromDay, "1") ? SalaryI18nUtil.getI18nLabel(98397, "本月1号——本月最后一天") - : SalaryI18nUtil.getI18nLabel(98401, "本月{0}号——下月{1}号") +// salaryCycleStr = Objects.equals(salaryCycleFromDay, "1") ? SalaryI18nUtil.getI18nLabel(98397, "本月1号——本月最后一天") +// : SalaryI18nUtil.getI18nLabel(98401, "本月{0}号——下月{1}号") +// .replace("{0}", "" + salaryCycleFromDay) +// .replace("{1}", "" + (Integer.parseInt(salaryCycleFromDay) - 1)); + salaryCycleStr = Objects.equals(salaryCycleFromDay, "1") + ? SalaryI18nUtil.getI18nLabel(98395, "本月") + "-" + "第一天" + "——" + + SalaryI18nUtil.getI18nLabel(98395, "本月") + "-" + SalaryI18nUtil.getI18nLabel(98395, "最后一天") + : SalaryI18nUtil.getI18nLabel(98401, "本月") + "-{0}——" + + SalaryI18nUtil.getI18nLabel(98401, "下个月") + "-{1}" .replace("{0}", "" + salaryCycleFromDay) .replace("{1}", "" + (Integer.parseInt(salaryCycleFromDay) - 1)); break; case NEXT_MONTH: - salaryCycleStr = Objects.equals(salaryCycleFromDay, "1") ? SalaryI18nUtil.getI18nLabel(98398, "下月1号——下月最后一天") - : SalaryI18nUtil.getI18nLabel(98402, "下月{0}号——下下月{1}号") +// salaryCycleStr = Objects.equals(salaryCycleFromDay, "1") ? SalaryI18nUtil.getI18nLabel(98398, "下月1号——下月最后一天") +// : SalaryI18nUtil.getI18nLabel(98402, "下月{0}号——下下月{1}号") +// .replace("{0}", "" + salaryCycleFromDay) +// .replace("{1}", "" + (Integer.parseInt(salaryCycleFromDay) - 1)); + salaryCycleStr = Objects.equals(salaryCycleFromDay, "1") + ? SalaryI18nUtil.getI18nLabel(98395, "下个月") + "-" + "第一天" + "——" + + SalaryI18nUtil.getI18nLabel(98395, "下个月") + "-" + SalaryI18nUtil.getI18nLabel(98395, "最后一天") + : SalaryI18nUtil.getI18nLabel(98402, "下个月") + "-{0}——" + + SalaryI18nUtil.getI18nLabel(98402, "下下个月") + "-{1}" .replace("{0}", "" + salaryCycleFromDay) .replace("{1}", "" + (Integer.parseInt(salaryCycleFromDay) - 1)); break; diff --git a/src/com/engine/salary/web/SalaryArchiveController.java b/src/com/engine/salary/web/SalaryArchiveController.java index 28e773578..df7a36330 100644 --- a/src/com/engine/salary/web/SalaryArchiveController.java +++ b/src/com/engine/salary/web/SalaryArchiveController.java @@ -396,7 +396,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(101601, "薪资档案导入模板") + "-" + SalaryI18nUtil.getI18nLabel(listTypeEnum.getLabelId(), listTypeEnum.getDefaultLabel()); if (isFixedList) { // 初始化 diff --git a/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java index 150ccfa06..1c4d769a8 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctEmployeeWrapper.java @@ -181,8 +181,11 @@ public class SalaryAcctEmployeeWrapper extends Service { List salaryAcctEmployeePOS = getSalaryAcctEmployeeService(user) .listBySalaryAcctRecordIdAndTaxAgentId(salaryAcctRecordId, NumberUtils.LONG_ZERO); if (CollectionUtils.isNotEmpty(salaryAcctEmployeePOS)) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98871, "有{0}个人无个税扣缴义务人,请先去薪资档案里维护员工档案,再点击当前页面的刷新按钮") + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98871, "请先去薪资档案里维护员工档案,再点击当前页面的刷新按钮。") + + SalaryI18nUtil.getI18nLabel(98871, "当前存在未设置个税扣缴义务人的员工数量") + ":{0}" .replace("{0}", "" + salaryAcctEmployeePOS.size())); +// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98871, "有{0}个人无个税扣缴义务人,请先去薪资档案里维护员工档案,再点击当前页面的刷新按钮") +// .replace("{0}", "" + salaryAcctEmployeePOS.size())); } } diff --git a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java index 300f0dda2..2f9139202 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java @@ -317,7 +317,7 @@ public class SalaryArchiveWrapper extends Service { } 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(100463, "薪资档案不存在!") + "[id:%s]", salaryArchiveId)); } List employeeList = employeeService.getEmployeeByIdsAll(Collections.singletonList(po.getEmployeeId())); @@ -552,17 +552,17 @@ public class SalaryArchiveWrapper extends Service { public SalaryArchivePO getSalaryArchiveInfo(SalaryArchiveQueryParam param) { SalaryArchivePO po = SalaryArchivePO.builder().employeeId(param.getEmployeeId()).build(); if (param.getEmployeeId() == null) { - throw new SalaryRunTimeException("人员id为空!"); + throw new SalaryRunTimeException("人员id为空"); } if (param.getTaxAgentId() != null) { po.setTaxAgentId(param.getTaxAgentId()); } List list = getSalaryArchiveService(user).listSome(po); if (CollectionUtils.isEmpty(list)) { - throw new SalaryRunTimeException("薪资档案不存在!"); + throw new SalaryRunTimeException("薪资档案不存在!"); } if (list.size() > 1) { - throw new SalaryRunTimeException("存在多个薪资档案!"); + throw new SalaryRunTimeException("存在多个薪资档案!"); } return list.get(0); } diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java index 30685c947..1a174b085 100644 --- a/src/com/engine/salary/wrapper/SalarySendWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java @@ -475,7 +475,7 @@ public class SalarySendWrapper extends Service { SalarySendPO salarySend = getSalarySendService(user).getById(queryParam.getSalarySendId()); if (salarySend == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100510, "工资发放不存在")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100510, "工资单发放不存在")); } SalaryAcctRecordPO salaryAcctRecord = getSalaryAcctRecordService(user).getById(salarySend.getSalaryAccountingId()); diff --git a/src/com/engine/salary/wrapper/TaxAgentWrapper.java b/src/com/engine/salary/wrapper/TaxAgentWrapper.java index 9f9fa2f1f..41d1546c2 100644 --- a/src/com/engine/salary/wrapper/TaxAgentWrapper.java +++ b/src/com/engine/salary/wrapper/TaxAgentWrapper.java @@ -223,7 +223,7 @@ public class TaxAgentWrapper extends Service { if (id != null) { TaxAgentPO taxAgent = getTaxAgentService(user).getById(id); if (taxAgent == null) { - throw new SalaryRunTimeException(String.format(SalaryI18nUtil.getI18nLabel(100543, "个税扣缴人不存在") + "[id:%s]", id)); + throw new SalaryRunTimeException(String.format(SalaryI18nUtil.getI18nLabel(100543, "个税扣缴义务人不存在") + "[id:%s]", id)); } BeanUtils.copyProperties(taxAgent, taxAgentFromDTO); }