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

Merge branch 'fix/CancelSetPayEndDate' into release/2.7.1.2303.02

This commit is contained in:
Harryxzy 2023-03-10 15:43:24 +08:00
parent 7de5c1e175 8dabfb28b9
commit 351d892281
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java
View File

@ -339,7 +339,7 @@ public class SalaryArchiveBO {
if (salaryArchive.getRunStatus().equals(SalaryArchiveStatusEnum.FIXED.getValue())) {
// 跳到待停薪
salaryArchive.setRunStatus(SalaryArchiveStatusEnum.SUSPEND.getValue());
salaryArchive.setPayEndDate(today);
// salaryArchive.setPayEndDate(today);
salaryArchiveUpdateTodoList.add(salaryArchive);
} else if (salaryArchive.getRunStatus().equals(SalaryArchiveStatusEnum.PENDING.getValue())) {
// 跳到停薪