薪资档案增加分部列

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"));

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;
+
     /**
      * 部门
      */

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
     </sql>
 
 
@@ -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)

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());