From b92c7ff599bc60d1828cd765924da7288dcc3e31 Mon Sep 17 00:00:00 2001
From: sy <sy666666>
Date: Fri, 7 Jul 2023 15:32:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E8=96=AA?=
 =?UTF-8?q?=E8=B5=84=E6=A0=B8=E7=AE=97=E3=80=81=E8=96=AA=E8=B5=84=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E3=80=81=E7=A6=8F=E5=88=A9=E6=A1=A3=E6=A1=88=EF=BC=8C?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E4=B8=AD=E7=9A=84=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9D=A1=E4=BB=B6=E6=94=B9=E4=B8=BA=E6=95=B0=E7=BB=84?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=85=A5=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/SalaryAcctEmployeeQueryParam.java    |  3 ++-
 .../param/SalaryAcctResultQueryParam.java      |  4 +++-
 .../param/SalaryArchiveQueryParam.java         |  2 ++
 .../salaryacct/SalaryAcctEmployeeMapper.xml    | 18 ++++++++++++++++++
 .../salary/web/SalaryAcctController.java       |  4 ++++
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
index f713e07a4..cfe97aae9 100644
--- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
+++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
@@ -50,7 +50,8 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam {
      */
 
     private SalaryEmployeeStatusEnum status;
-    private Collection<Integer> statusList;
+    //状态(多选)
+    private List<String> statuses;
 
     //离职日期")
     private LocalDateRange dismissDate;
diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java
index 6edf7ab10..c82ebf8af 100644
--- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java
+++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java
@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * 薪资核算结果查询参数
@@ -46,7 +47,8 @@ public class SalaryAcctResultQueryParam extends BaseQueryParam {
 
     //状态
     private SalaryEmployeeStatusEnum status;
-    private Collection<Integer> statusList;
+    //状态(多选)
+    private List<String> statuses;
 
     //离职日期
     private LocalDateRange dismissDate;
diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
index c975e8283..f52e8bee2 100644
--- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
+++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
@@ -48,6 +48,8 @@ public class SalaryArchiveQueryParam extends BaseQueryParam {
 
     //状态
     private String userstatus;
+    //状态(多选)
+    private List<String> statuses;
 
     //入职日期
     private List<String> hiredate;
diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
index f414ff60f..ea8fac029 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
@@ -528,6 +528,12 @@
                     #{positionId}
                 </foreach>
             </if>
+            <if test="param.statuses != null and param.statuses.size()>0">
+                AND em.status IN
+                <foreach collection="param.statuses" open="(" item="userStatus" separator="," close=")">
+                    #{userStatus}
+                </foreach>
+            </if>
             -- 在职
             <if test="param.status != null  and param.status.toString == 'NORMAL'">
                 AND em.status in (0,1,2,3)
@@ -611,6 +617,12 @@
                     #{positionId}
                 </foreach>
             </if>
+            <if test="param.statuses != null and param.statuses.size()>0">
+                AND em.status IN
+                <foreach collection="param.statuses" open="(" item="userStatus" separator="," close=")">
+                    #{userStatus}
+                </foreach>
+            </if>
             -- 在职
             <if test="param.status != null  and param.status.toString == 'NORMAL'">
                 AND em.status in (0,1,2,3)
@@ -694,6 +706,12 @@
                     #{positionId}
                 </foreach>
             </if>
+            <if test="param.statuses != null and param.statuses.size()>0">
+                AND em.status IN
+                <foreach collection="param.statuses" open="(" item="userStatus" separator="," close=")">
+                    #{userStatus}
+                </foreach>
+            </if>
             -- 在职
             <if test="param.status != null  and param.status.toString == 'NORMAL'">
                 AND em.status in (0,1,2,3)
diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java
index 6f06d003b..d66893e72 100644
--- a/src/com/engine/salary/web/SalaryAcctController.java
+++ b/src/com/engine/salary/web/SalaryAcctController.java
@@ -709,6 +709,10 @@ public class SalaryAcctController {
         if (StringUtils.isNotBlank(status)) {
             param.setStatus(SalaryEmployeeStatusEnum.parseByValue(Integer.parseInt(status)));
         }
+        String statuses = request.getParameter("statuses");
+        if (StringUtils.isNotBlank(statuses)) {
+            param.setStatuses(Arrays.stream(statuses.split(",")).map(String::valueOf).collect(Collectors.toList()));
+        }
         //fixme 日期
         request.getParameter("dismissDate");
         String consolidatedTaxation = request.getParameter("consolidatedTaxation");