From deffd8e41f94ccc4500d75184e8e43119ce4a9a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 9 Aug 2022 10:09:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=83=A8=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/salaryarchive/bo/SalaryArchiveBO.java | 1 + .../entity/salaryarchive/dto/SalaryArchiveListDTO.java | 6 ++++++ .../engine/salary/mapper/archive/SalaryArchiveMapper.xml | 4 ++++ .../salary/service/impl/SalaryArchiveServiceImpl.java | 1 + 4 files changed, 12 insertions(+) diff --git a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java index 8a1366e65..98be55fcd 100644 --- a/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java +++ b/src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveBO.java @@ -63,6 +63,7 @@ public class SalaryArchiveBO { columns.add(employeeIdColumn); columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(85429, "姓名"), "username")); columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), "taxAgentName")); + columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86185, "分部"), "subcompanyName")); columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86185, "部门"), "departmentName")); columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86186, "手机号"), "mobile")); columns.add(new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(86187, "员工状态"), "employeeStatus")); diff --git a/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java b/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java index e605fcd26..66832bc16 100644 --- a/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java +++ b/src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveListDTO.java @@ -49,6 +49,12 @@ public class SalaryArchiveListDTO { private String taxAgentName; private Long taxAgentId; + /** + * 分部 + */ + @TableTitle(title = "分部", dataIndex = "subcompanyName", key = "subcompanyName") + private String subcompanyName; + /** * 部门 */ diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml index a4174ff39..9d804b785 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml @@ -88,6 +88,7 @@ , e.lastname as username , e.status AS employeeStatus , d.departmentname AS departmentName + , c.subcompanyname AS subcompanyName @@ -99,6 +100,7 @@ hrsa_salary_archive t1 LEFT JOIN hrmresource e ON e.id = t1.employee_id LEFT JOIN hrmdepartment d ON d.id = e.departmentid + LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1 WHERE t1.delete_type = 0 and e.status not in (7) and (e.accounttype is null or e.accounttype = 0) @@ -150,6 +152,7 @@ hrsa_salary_archive t1 LEFT JOIN hrmresource e ON e.id = t1.employee_id LEFT JOIN hrmdepartment d ON d.id = e.departmentid + LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1 WHERE t1.delete_type = 0 and e.status not in (7) and (e.accounttype is null or e.accounttype = 0) @@ -200,6 +203,7 @@ hrsa_salary_archive t1 LEFT JOIN hrmresource e ON e.id = t1.employee_id LEFT JOIN hrmdepartment d ON d.id = e.departmentid + LEFT JOIN hrmsubcompany c ON c.id = e.subcompanyid1 WHERE t1.delete_type = 0 and e.status not in (7) and (e.accounttype is null or e.accounttype = 0) diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index f92b91c49..64a5b9006 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -302,6 +302,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe map.put("taxAgentId", Optional.ofNullable(taxAgentPO).map(TaxAgentPO::getId).orElse(0L)); // map.put("taxAgentEffectiveTime", optionalTaxAgent.isPresent() ? optionalTaxAgent.get().get("taxAgentEffectiveTime") : ""); + map.put("subcompanyName", e.getSubcompanyName()); map.put("departmentName", e.getDepartmentName()); map.put("mobile", e.getMobile()); map.put("employeeStatus", e.getEmployeeStatus());