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

薪资明细增加人员浏览按钮多选搜索

This commit is contained in:
钱涛 2025-03-18 17:45:00 +08:00
parent 3b520fcf62
commit c8f281613b
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java
View File

@ -25,6 +25,9 @@ public class SalaryStatisticsEmployeeSalaryQueryParam extends BaseQueryParam {
// 关键字 // 关键字
private String keyword; private String keyword;
//人员ids
private List<Long> employeeIds;
// 起始年月 // 起始年月
private String startDateStr; private String startDateStr;
private Date startDate; private Date startDate;

7
src/com/engine/salary/report/service/impl/SalaryStatisticsEmployeeServiceImpl.java
View File

@ -344,6 +344,13 @@ public class SalaryStatisticsEmployeeServiceImpl extends Service implements Sala
List<Long> employeeIds = employeeList.stream().map(DataCollectionEmployee::getEmployeeId).collect(Collectors.toList()); List<Long> employeeIds = employeeList.stream().map(DataCollectionEmployee::getEmployeeId).collect(Collectors.toList());
salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(acctEmp -> employeeIds.contains(acctEmp.getEmployeeId())).collect(Collectors.toList()); salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(acctEmp -> employeeIds.contains(acctEmp.getEmployeeId())).collect(Collectors.toList());
} }
//人员浏览按钮筛选
List<Long> employeeIds = queryParam.getEmployeeIds();
if(CollectionUtils.isNotEmpty(employeeIds)){
salaryAcctEmployeeList = salaryAcctEmployeeList.stream().filter(acctEmp -> employeeIds.contains(acctEmp.getEmployeeId())).collect(Collectors.toList());
}
if (CollectionUtils.isEmpty(salaryAcctEmployeeList)) { if (CollectionUtils.isEmpty(salaryAcctEmployeeList)) {
return new PageInfo<>(); return new PageInfo<>();
} }