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

人员全部显示

This commit is contained in:
钱涛 2023-04-28 11:18:01 +08:00
parent 2d8b4b07d0
commit 20e4856c23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
View File

@ -35,7 +35,6 @@ import com.engine.salary.service.impl.TaxAgentServiceImpl;
import com.engine.salary.util.*;
import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@ -778,11 +777,12 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
}
private PageInfo<Map<String, Object>> buildEmployeeRecords(SalaryStatisticsReportDataQueryParam param, SalaryStatisticsReportDataDTO data, Map<Long, Map<String, String>> salaryAcctResultValueMap) {
List<Long> employeeIds = data.getList().stream().map(SalaryAcctEmployeePO::getEmployeeId).distinct().collect(Collectors.toList());
List<Map<String, Object>> records = new ArrayList<>();
// List<Long> employeeIds = data.getList().stream().map(SalaryAcctEmployeePO::getEmployeeId).distinct().collect(Collectors.toList());
List<Long> pageEmployeeIds = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), employeeIds);
List<SalaryAcctEmployeePO> accountDetailPOList = data.getList().stream().filter(po -> pageEmployeeIds.contains(po.getEmployeeId())).collect(Collectors.toList());
// List<Long> pageEmployeeIds = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), employeeIds);
// List<SalaryAcctEmployeePO> accountDetailPOList = data.getList().stream().filter(po -> pageEmployeeIds.contains(po.getEmployeeId())).collect(Collectors.toList());
List<Map<String, Object>> records = new ArrayList<>();
List<SalaryAcctEmployeePO> accountDetailPOList = data.getList();
Map<Long, List<SalaryAcctEmployeePO>> employeeListMap = accountDetailPOList.stream().collect(Collectors.groupingBy(SalaryAcctEmployeePO::getEmployeeId));
Map<Long, List<SalaryAcctEmployeePO>> lastEmployeeListMap = data.getLastList().stream().collect(Collectors.groupingBy(SalaryAcctEmployeePO::getEmployeeId));
Map<Long, List<SalaryAcctEmployeePO>> sameEmployeeListMap = data.getSameList().stream().collect(Collectors.groupingBy(SalaryAcctEmployeePO::getEmployeeId));
@ -801,8 +801,6 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
PageInfo<Map<String, Object>> result = new PageInfo<>();
result.setList(records);
result.setTotal(employeeIds.size());
return result;
}