From 391fa6ebd95969468cdd0f803ff8c4397bfb46a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 1 Nov 2024 10:04:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A3=E7=BC=B4=E4=B9=89=E5=8A=A1=E4=BA=BA?=
 =?UTF-8?q?=E5=92=8C=E8=B4=A6=E5=A5=97=E7=9A=84=E4=BA=BA=E5=91=98=E7=9A=84?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/entity/salarysob/bo/SalarySobRangeBO.java     | 1 +
 .../entity/salarysob/dto/SalarySobRangeListDTO.java      | 2 ++
 src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java | 9 +++++++++
 .../entity/taxagent/dto/TaxAgentManageRangeListDTO.java  | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java
index 6b3f41896..91650430b 100644
--- a/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java
+++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java
@@ -125,6 +125,7 @@ public class SalarySobRangeBO {
                             .target(salarySobRangePO.getTarget())
                             .targetName(buildTargetName(salarySobRangePO, employeeComInfoMap, departmentComInfoMap, subCompanyComInfoMap, positionComInfoMap))
                             .employeeStatus(employeeStatusesStr)
+                            .status(salarySobRangePO.getEmployeeStatuses())
                             .build();
                 })
                 .collect(Collectors.toList());
diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobRangeListDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobRangeListDTO.java
index b5060f113..ea63898c1 100644
--- a/src/com/engine/salary/entity/salarysob/dto/SalarySobRangeListDTO.java
+++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobRangeListDTO.java
@@ -54,4 +54,6 @@ public class SalarySobRangeListDTO {
     @SalaryTableColumn(text = "员工状态", width = "10%", column = "employeeStatus")
     @TableTitle(title = "员工状态", dataIndex = "employeeStatus", key = "employeeStatus")
     private String employeeStatus;
+
+    private String status;
 }
diff --git a/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java b/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
index cd1ed7b36..caf20dca6 100644
--- a/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
+++ b/src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
@@ -301,6 +301,7 @@ public class TaxAgentBO {
                             .target(taxAgentManageRange.getTarget())
                             .targetName(buildTargetName(taxAgentManageRange, employeeComInfoMap, departmentComInfoMap, subDepartmentComInfoMap, positionComInfoMap))
                             .employeeStatus(buildEmployeeStatus(hrmStatusNameMap, taxAgentManageRange.getEmployeeStatus()))
+                            .status(buildStatus(taxAgentManageRange.getEmployeeStatus()))
                             .build();
                 })
                 .collect(Collectors.toList());
@@ -316,6 +317,14 @@ public class TaxAgentBO {
                 .collect(Collectors.joining(","));
     }
 
+    private static String buildStatus( String employeeStatus) {
+        List<String> employeeStatusList = JsonUtil.parseList(employeeStatus, String.class);
+        if (CollectionUtils.isEmpty(employeeStatusList)) {
+            return StringUtils.EMPTY;
+        }
+        return String.join(",", employeeStatusList);
+    }
+
     /**
      * 构建对象名
      *
diff --git a/src/com/engine/salary/entity/taxagent/dto/TaxAgentManageRangeListDTO.java b/src/com/engine/salary/entity/taxagent/dto/TaxAgentManageRangeListDTO.java
index d87bf0a3b..db8f3411f 100644
--- a/src/com/engine/salary/entity/taxagent/dto/TaxAgentManageRangeListDTO.java
+++ b/src/com/engine/salary/entity/taxagent/dto/TaxAgentManageRangeListDTO.java
@@ -59,4 +59,6 @@ public class TaxAgentManageRangeListDTO {
     )
     @TableTitle(title ="员工状态",key = "employeeStatus",dataIndex = "employeeStatus")
     private String employeeStatus;
+
+    private String status;
 }