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

Merge remote-tracking branch 'origin/release/3.0.0.2502.01' into release/3.0.0.2502.01

This commit is contained in:
钱涛 2025-02-27 10:29:21 +08:00
parent 1b77352301 bf57c66fc1
commit b37610dd13
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1099,9 +1099,13 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
return StringUtils.EMPTY;
}
// 从待定薪到停薪
getSalaryArchiveMapper().deletePendingTodo(ids);
List<List<Long>> partition = Lists.partition((List<Long>) ids, 800);
partition.forEach(getSalaryArchiveMapper()::deletePendingTodo);
// 记录日志
List<SalaryArchivePO> newList = getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(ids).build());
List<SalaryArchivePO> newList = new ArrayList<>();
partition.forEach(part -> {
newList.addAll(getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(part).build()));
});
String operatedesc = SalaryI18nUtil.getI18nLabel(0, "删除待办");
recordLog(oldList, newList, operatedesc);
@ -1131,11 +1135,14 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
}
// 从待定薪到定薪
List<List<Long>> partition = Lists.partition((List<Long>) ids, 1000);
List<List<Long>> partition = Lists.partition((List<Long>) ids, 800);
partition.forEach(getSalaryArchiveMapper()::gotoFixed);
// 记录日志
List<SalaryArchivePO> newList = getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(ids).build());
List<SalaryArchivePO> newList = new ArrayList<>();
partition.forEach(part -> {
newList.addAll(getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(part).build()));
});
String operateDesc = SalaryI18nUtil.getI18nLabel(0, "设为发薪员工");
recordLog(salaryArchiveList, newList, operateDesc);
@ -1201,10 +1208,14 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
}
// 从待停薪到停薪
getSalaryArchiveMapper().gotoStop(ids);
List<List<Long>> partition = Lists.partition((List<Long>) ids, 800);
partition.forEach(getSalaryArchiveMapper()::gotoStop);
// 记录日志
List<SalaryArchivePO> newList = getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(ids).build());
List<SalaryArchivePO> newList = new ArrayList<>();
partition.forEach(part -> {
newList.addAll( getSalaryArchiveMapper().listSome(SalaryArchivePO.builder().ids(part).build()));
});
String operatedesc = SalaryI18nUtil.getI18nLabel(0, "停薪");
recordLog(oldList, newList, operatedesc);