qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

薪资核算人员去除 停薪_来自待定薪

This commit is contained in:
Harryxzy 2023-06-19 09:16:49 +08:00
parent 1c6cf5feab
commit 6850c050b8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/biz/SIAccountBiz.java
View File

@ -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());
}

2
src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
View File

@ -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());