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

解决冲突

This commit is contained in:
Harryxzy 2024-11-14 09:13:23 +08:00
parent 8a06eaad93
commit cd182a24b7
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
View File

@ -215,9 +215,6 @@ public class SalaryAcctResultWrapper extends Service implements SalaryAcctResult
public void calculate(SalaryAcctCalculateParam calculateParam) { public void calculate(SalaryAcctCalculateParam calculateParam) {
log.info("开始核算V1{}", calculateParam); log.info("开始核算V1{}", calculateParam);
//报表参数
List<DataCollectionEmployee> emps = getSalaryEmployeeService(user).listAllForReport();
calculateParam.setEmps(SalaryEntityUtil.convert2Map(emps, DataCollectionEmployee::getEmployeeId));
// 校验是否可以编辑 // 校验是否可以编辑
SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(calculateParam.getSalaryAcctRecordId()); SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(calculateParam.getSalaryAcctRecordId());