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

港湾fix

This commit is contained in:
Harryxzy 2023-12-22 16:05:14 +08:00
parent 02f8da3a81
commit cdc77ea801
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/entity/salaryacct/dto/pltxEmployeeDTO.java
View File

@ -20,6 +20,12 @@ public class pltxEmployeeDTO {
// 姓名
private Long employee;
private String employeeName;
private Long bmId;
private String bmName;
// 个税扣缴义务人
private String gskjywr;

9
src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
View File

@ -1470,6 +1470,8 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
List<Long> empIds = allEmps.stream().map(SalaryAcctEmployeePO::getEmployeeId).collect(Collectors.toList());
List<String> taxAgentEmpList = allEmps.stream().map(emp -> emp.getTaxAgentId() + "-" + emp.getEmployeeId()).collect(Collectors.toList());
List<SalaryArchivePO> salaryArchivePOS = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().employeeIds(empIds).build());
List<DataCollectionEmployee> employeeList = getSalaryEmployeeService(user).listByIds(empIds);
Map<Long, DataCollectionEmployee> 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<SalaryArchiveItemPO> salaryArchiveItemList = getSalaryArchiveService(user).getCurrentEffectiveItemList(salaryArchivePOS.stream().map(SalaryArchivePO::getId).collect(Collectors.toList()), Collections.singletonList(salaryItemId));
Map<Long, SalaryArchiveItemPO> 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) {