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

Merge remote-tracking branch 'origin/custom/联特' into custom/联特

This commit is contained in:
Harryxzy 2025-05-14 15:03:51 +08:00
parent e2839767fa 24c67ddaf3
commit 97e90e0a81
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java
View File

@ -148,6 +148,12 @@ public class EmployeeDeclareRefresh {
employeeDeclare.setDismissDate(salaryArchive.getPayEndDate());
}
//二开，过滤掉停薪员工
if (SalaryArchiveStatusEnum.STOP_FROM_PENDING.getValue().equals(salaryArchive.getRunStatus())
|| SalaryArchiveStatusEnum.STOP_FROM_SUSPEND.getValue().equals(salaryArchive.getRunStatus())) {
continue;
}
//二开，过滤起始发薪日期>=当前税款所属期的
Date payStartDate = salaryArchive.getPayStartDate();
if (!payStartDate.before(dto.getTaxCycle())) {