From 845586cba2244e97d11ec40e1ae64704af540bb2 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 10 May 2024 14:54:02 +0800 Subject: [PATCH 1/2] test --- .../engine/salary/service/impl/AddUpDeductionServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index 322afcc6b..bdd7a77ad 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -737,7 +737,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction String cacheKey = "addUpDeduction_autoAddAll_processing"; Object objVal = Util_DataCache.getObjVal(cacheKey); if (objVal != null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(135788, "一键累计过于频繁，请稍后再试")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(135788, "一键累计过于频繁，请稍后再试 ")); } try { Util_DataCache.setObjVal(cacheKey, true); From 1c1a77d387a455bf5948e6e1a2419bfcf46751d2 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 10 May 2024 15:41:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=B7=A5?= =?UTF-8?q?=E8=B5=84=E5=8D=95=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E7=99=BB?= =?UTF-8?q?=E9=99=86=E4=BA=BAid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/salaryBill/dto/SalaryMySalaryBillListDTO.java | 5 +++-- .../engine/salary/service/impl/SalarySendServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryMySalaryBillListDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryMySalaryBillListDTO.java index f8a8d3eea..af239ee5f 100644 --- a/src/com/engine/salary/entity/salaryBill/dto/SalaryMySalaryBillListDTO.java +++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryMySalaryBillListDTO.java @@ -5,8 +5,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.Date; /** @@ -62,4 +60,7 @@ public class SalaryMySalaryBillListDTO { private Date sendTime; + private Long employeeId; + + } diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 9a9c750ca..782317f9f 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -807,7 +807,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService queryParam.setStartSalaryMonth(getLimitMonth()); List list = salarySendInfoMapper.mySalaryBillList(queryParam); - + list.forEach(dto -> dto.setEmployeeId(Long.valueOf(user.getUID()))); PageInfo pageInfo = new PageInfo<>(list, SalaryMySalaryBillListDTO.class); pageInfo.setTotal(list.size()); pageInfo.setPageNum(queryParam.getCurrent());