From a3137940a3f128ae8050aa7fb0fb283023caec47 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 4 Dec 2024 10:47:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E9=80=9A=E6=95=B0=E6=8D=AE=E7=A9=BF?= =?UTF-8?q?=E9=80=8F=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/SalaryAcctResultServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index a96490b81..e61bbff27 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -1366,10 +1366,11 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe List 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 salaryItemPOS = getSalaryItemService(user).listByIds(salaryItemIds); // 查询薪资核算结果 List salaryAcctEmployeeIds = SalaryEntityUtil.properties(salaryAcctEmployeePOS, SalaryAcctEmployeePO::getId, Collectors.toList());