From 6850c050b8372a3579042f2a81489c0d886c781b Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 19 Jun 2023 09:16:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=8E=BB=E9=99=A4=20=E5=81=9C=E8=96=AA=5F=E6=9D=A5?= =?UTF-8?q?=E8=87=AA=E5=BE=85=E5=AE=9A=E8=96=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIAccountBiz.java | 2 +- .../engine/salary/service/impl/SalaryArchiveServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 2b70e803b..96b6d0e0d 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -291,7 +291,7 @@ public class SIAccountBiz extends Service { if(Objects.isNull(salaryAcctEmployeeRule) || StringUtils.equals(salaryAcctEmployeeRule.getConfValue(), SalaryAcctEmployeeRuleEnum.BYPAYENDTIME.getValue()) ){ // 包含停缴 status = Arrays.asList(EmployeeStatusEnum.PAYING.getValue(),EmployeeStatusEnum.STAY_DEL.getValue(), - EmployeeStatusEnum.STOP_PAYMENT_FROM_DEL.getValue(), EmployeeStatusEnum.STOP_PAYMENT_FROM_ADD.getValue()); + EmployeeStatusEnum.STOP_PAYMENT_FROM_DEL.getValue()); }else{ status = Arrays.asList(EmployeeStatusEnum.PAYING.getValue(),EmployeeStatusEnum.STAY_DEL.getValue()); } diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index 751dad868..2383d817c 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -707,7 +707,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe if(Objects.isNull(employeeRule) || StringUtils.equals(employeeRule.getConfValue(), SalaryAcctEmployeeRuleEnum.BYPAYENDTIME.getValue())){ // 默认包含停薪列表 statusList = Arrays.asList(SalaryArchiveStatusEnum.FIXED.getValue(), SalaryArchiveStatusEnum.SUSPEND.getValue(), - SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue(), SalaryArchiveStatusEnum.STOP_FROM_PENDING.getValue()); + SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue() ); }else{ // 仅包含发薪、待定薪 statusList = Arrays.asList(SalaryArchiveStatusEnum.FIXED.getValue(), SalaryArchiveStatusEnum.SUSPEND.getValue());