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

汇通数据穿透增加工号

This commit is contained in:
Harryxzy 2024-12-04 10:47:08 +08:00
parent 62b97cb330
commit a3137940a3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1366,10 +1366,11 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
List<WeaTableColumnGroup> columns = Lists.newArrayList();
// 员工信息字段
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption("个税扣缴义务人", 0), "个税扣缴义务人", "taxAgentName"));
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption("编号", 0), "编号", "workcode"));
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption("姓名", 0), "姓名", "username"));
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption("分部", 0), "分部", "subcompanyName"));
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption("部门", 0), "部门", "departmentName"));
columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption("状态", 0), "状态", "statusName"));
// columns.add(new WeaTableColumnGroup(SalaryPageUtil.selfAdaption("状态", 0), "状态", "statusName"));
// 薪资项目
for (Long salaryItemId : salaryItemIds) {
@ -1423,7 +1424,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
salarySobEmpFieldPOS.add(SalarySobEmpFieldPO.builder().fieldCode("username").build());
salarySobEmpFieldPOS.add(SalarySobEmpFieldPO.builder().fieldCode("subcompanyName").build());
salarySobEmpFieldPOS.add(SalarySobEmpFieldPO.builder().fieldCode("departmentName").build());
salarySobEmpFieldPOS.add(SalarySobEmpFieldPO.builder().fieldCode("statusName").build());
// salarySobEmpFieldPOS.add(SalarySobEmpFieldPO.builder().fieldCode("statusName").build());
salarySobEmpFieldPOS.add(SalarySobEmpFieldPO.builder().fieldCode("workcode").build());
List<SalaryItemPO> salaryItemPOS = getSalaryItemService(user).listByIds(salaryItemIds);
// 查询薪资核算结果
List<Long> salaryAcctEmployeeIds = SalaryEntityUtil.properties(salaryAcctEmployeePOS, SalaryAcctEmployeePO::getId, Collectors.toList());