From be3ad3b47b111c4ea69fabbff59f2bff7d0509c9 Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 13 Dec 2023 17:17:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E4=BA=8C?= =?UTF-8?q?=E5=BC=80=EF=BC=8C=E4=B8=8A=E6=B5=B7=E6=B8=AF=E6=B9=BE-?= =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=EF=BC=8C=E6=8B=89=E5=8F=96=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=801201=E5=88=86=E6=94=AF=EF=BC=8C=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/salaryacct/bo/SalaryAcctRecordBO.java | 4 ++-- .../salary/service/impl/SalaryAcctRecordServiceImpl.java | 2 +- .../salary/service/impl/SalaryAcctResultServiceImpl.java | 2 +- src/com/engine/salary/service/impl/SalarySendServiceImpl.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java index 0335e2427..db1fb0fa2 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java @@ -84,7 +84,7 @@ public class SalaryAcctRecordBO { btnList.add(new WeaTableOperate(SalaryI18nUtil.getI18nLabel(user.getLanguage(),535052, "删除"), null, "1")); } btnList.add(new WeaTableOperate(SalaryI18nUtil.getI18nLabel(user.getLanguage(),251, "归档"), null, "2")); - } else if (SalaryAcctRecordStatusEnum.ARCHIVED == salaryAcctRecordStatusEnum && ( salarySendMap.get(salaryAcctRecordPO.getId()) ==Boolean.TRUE ) ){ + } else if (SalaryAcctRecordStatusEnum.ARCHIVED == salaryAcctRecordStatusEnum && (salarySendMap.get(salaryAcctRecordPO.getId()).equals(Boolean.TRUE)) ){ btnList.add(new WeaTableOperate(SalaryI18nUtil.getI18nLabel(user.getLanguage(),33564, "查看"), null, "3")); btnList.add(new WeaTableOperate(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542637, "重新核算"), null, "5")); btnList.add(new WeaTableOperate(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542638, "回算"), null, "4")); @@ -108,7 +108,7 @@ public class SalaryAcctRecordBO { .accountantName(usernameMap.getOrDefault(salaryAcctRecordPO.getCreator(), StringUtils.EMPTY)) .updateTime(SalaryDateUtil.getFormatLocalDateTime(salaryAcctRecordPO.getUpdateTime())) .description(salaryAcctRecordPO.getDescription()) - .workFlowStatus(workflowStatusEnum.getDefaultLabel()) + .workFlowStatus(SalaryI18nUtil.getI18nLabel(user.getLanguage(),workflowStatusEnum.getLabelId(), workflowStatusEnum.getDefaultLabel())) .operate(btnList) .build(); }).collect(Collectors.toList()); diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index cc2661006..ffd7b3869 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -900,7 +900,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe public void setApprovalRequestId(SalaryAcctRecordReAccountParam param) { SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordMapper().getById(param.getSalaryAcctRecordId()); if (ObjectUtil.isEmpty(salaryAcctRecordPO)) { - throw new SalaryRunTimeException("薪资核算记录不存在或已被删除"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542300, "薪资核算记录不存在或已被删除")); } salaryAcctRecordPO.setApprovalRequestId(param.getApprovalRequestId()); salaryAcctRecordPO.setUpdateTime(new Date()); diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index f71671767..76f71e2a0 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -1096,7 +1096,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe public Map sumForWorkflow(SalaryAcctResultQueryParam param) { SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(param.getSalaryAcctRecordId()); if (ObjectUtil.isEmpty(salaryAcctRecordPO)) { - throw new SalaryRunTimeException("薪资核算记录不存在或已被删除"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542300, "薪资核算记录不存在或已被删除")); } BaseBean baseBean = new BaseBean(); String fieldNameStr = baseBean.getPropValue("shgwSalary", "fieldName"); diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index feb1dabb9..4869f2eb0 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -1494,7 +1494,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService // 1.工作簿名称 String sheetName = SalaryI18nUtil.getI18nLabel(user.getLanguage(),542417, "工资单发放信息"); List header = new ArrayList<>(); - header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),85429, "姓名")); + header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),25034, "姓名")); header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),537996, "个税扣缴义务人")); header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门")); header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),125238, "手机号"));