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

报表支持传账套id

This commit is contained in:
Harryxzy 2025-08-28 10:32:40 +08:00
parent 61cf337bde
commit 2fa5dcc384
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/engine/salary/entity/salaryacct/param/FsdReportRuleJSONParam.java
View File

@ -25,6 +25,7 @@ public class FsdReportRuleJSONParam {
private List<Long> deptids;
private List<Long> jobtitleids;
private List<Long> subcomids;
private List<Long> salarysobids;
}

3
src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
View File

@ -1609,6 +1609,9 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
resultMap.put("value", lsValSum.toString());
return resultMap;
}
if (CollectionUtils.isNotEmpty(rule.getSalarysobids())) {
salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(salaryAcctEmployee -> rule.getSalarysobids().contains(salaryAcctEmployee.getSalarySobId())).collect(Collectors.toList());
}
if (CollectionUtils.isNotEmpty(rule.getSubcomids())) {
salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(salaryAcctEmployee -> rule.getSubcomids().contains(salaryAcctEmployee.getSubcompanyId())).collect(Collectors.toList());
}