diff --git a/src/com/engine/salary/entity/salaryacct/dto/pltxEmployeeDTO.java b/src/com/engine/salary/entity/salaryacct/dto/pltxEmployeeDTO.java index 88b8e7ec0..e1e7a73a7 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/pltxEmployeeDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/pltxEmployeeDTO.java @@ -20,6 +20,12 @@ public class pltxEmployeeDTO { // 姓名 private Long employee; + private String employeeName; + + private Long bmId; + + private String bmName; + // 个税扣缴义务人 private String gskjywr; diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index 296ec59b0..aeb0a66cf 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -1470,6 +1470,8 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc List empIds = allEmps.stream().map(SalaryAcctEmployeePO::getEmployeeId).collect(Collectors.toList()); List taxAgentEmpList = allEmps.stream().map(emp -> emp.getTaxAgentId() + "-" + emp.getEmployeeId()).collect(Collectors.toList()); List salaryArchivePOS = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().employeeIds(empIds).build()); + List employeeList = getSalaryEmployeeService(user).listByIds(empIds); + Map employeeMap = SalaryEntityUtil.convert2Map(employeeList, DataCollectionEmployee::getEmployeeId); // 过滤薪资档案 salaryArchivePOS = salaryArchivePOS.stream().filter(po -> taxAgentEmpList.contains(po.getTaxAgentId()+"-"+po.getEmployeeId())).collect(Collectors.toList()); // key:义务人id-人员id value:薪资档案id @@ -1477,9 +1479,14 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc List salaryArchiveItemList = getSalaryArchiveService(user).getCurrentEffectiveItemList(salaryArchivePOS.stream().map(SalaryArchivePO::getId).collect(Collectors.toList()), Collections.singletonList(salaryItemId)); Map salaryArchiveItemMap = SalaryEntityUtil.convert2Map(salaryArchiveItemList, SalaryArchiveItemPO::getSalaryArchiveId); allEmps.stream().forEach(emp -> { + DataCollectionEmployee e = employeeMap.getOrDefault(emp.getEmployeeId(), DataCollectionEmployee.builder().build()); // 获取他的薪资档案id Long archiveId = salaryArchiveMap.get(emp.getTaxAgentId() + "-" + emp.getEmployeeId()); - pltxEmployeeDTO dto = pltxEmployeeDTO.builder().employee(emp.getEmployeeId()).gskjywr(taxAgentNameMap.get(emp.getTaxAgentId())).build(); + pltxEmployeeDTO dto = pltxEmployeeDTO.builder().employee(emp.getEmployeeId()) + .employeeName(e.getUsername()) + .bmId(e.getDepartmentId()) + .bmName(e.getDepartmentName()) + .gskjywr(taxAgentNameMap.get(emp.getTaxAgentId())).build(); if (archiveId != null) { SalaryArchiveItemPO salaryArchiveItemPO = salaryArchiveItemMap.get(archiveId); if (salaryArchiveItemPO != null) {