From 42e91e32da8091e7f09b09664e3a81646d085aed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 26 Aug 2024 09:26:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=80=9A=E8=BF=87=E5=BF=AB?=
 =?UTF-8?q?=E7=85=A7=E4=BF=A1=E6=81=AF=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/SalaryAcctEmployeeQueryParam.java   |   1 -
 .../salaryacct/SalaryAcctEmployeeMapper.xml   | 468 +++---------------
 .../salary/web/SalaryAcctController.java      |   4 -
 3 files changed, 81 insertions(+), 392 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
index 81266c2d3..2d532855e 100644
--- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
+++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
@@ -48,7 +48,6 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam {
      * 状态
      * @see SalaryEmployeeStatusEnum
      */
-
     private SalaryEmployeeStatusEnum status;
     //状态(多选)
     private List<String> statuses;
diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
index d0a5e2311..28f8e7779 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
@@ -573,13 +573,34 @@
         <if test="param.taxAgentId != null">
             AND t.tax_agent_id = #{param.taxAgentId}
         </if>
+        -- 分部
+        <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
+            AND t.subcompany_id IN
+            <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
+                #{subcompanyId}
+            </foreach>
+        </if>
+        -- 部门
+        <if test="param.departmentIds != null and param.departmentIds.size()>0">
+            AND t.department_id IN
+            <foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
+                #{departmentId}
+            </foreach>
+        </if>
+        <if test="param.positionIds != null and param.positionIds.size()>0">
+            AND t.jobtitle_id IN
+            <foreach collection="param.positionIds" open="(" item="positionId" separator="," close=")">
+                #{positionId}
+            </foreach>
+        </if>
+        <if test="param.statuses != null and param.statuses.size()>0">
+            AND t.status IN
+            <foreach collection="param.statuses" open="(" item="userStatus" separator="," close=")">
+                #{userStatus}
+            </foreach>
+        </if>
         <if test="(param.employeeName != null and param.employeeName != '')
-            or (param.workcode != null and param.workcode != '')
-            or (param.subcompanyIds != null and param.subcompanyIds.size()>0)
-            or (param.departmentIds != null and param.departmentIds.size()>0)
-            or (param.positionIds != null and param.positionIds.size()>0)
-            or (param.statuses != null and param.statuses.size()>0)
-            or (param.status != null and param.status.toString != 'ALL')">
+            or (param.workcode != null and param.workcode != '')">
             AND t.employee_id IN
             (
             SELECT id FROM hrmresource em WHERE em.status not in (7)
@@ -590,68 +611,6 @@
             <if test="param.workcode != null and param.workcode != ''">
                 AND em.workcode like CONCAT('%',#{param.workcode},'%')
             </if>
-            -- 分部
-            <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
-                AND em.subcompanyid1 IN
-                <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
-                    #{subcompanyId}
-                </foreach>
-            </if>
-            -- 部门
-            <if test="param.departmentIds != null and param.departmentIds.size()>0">
-                AND em.departmentid IN
-                <foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
-                    #{departmentId}
-                </foreach>
-            </if>
-            <if test="param.positionIds != null and param.positionIds.size()>0">
-                AND em.jobtitle IN
-                <foreach collection="param.positionIds" open="(" item="positionId" separator="," close=")">
-                    #{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)
-            </if>
-            -- 离职(解雇，离职，退休)
-            <if test="param.status != null  and param.status.toString == 'UNAVAILABLE'">
-                AND em.status in (4,5,6)
-            </if>
-            -- 试用
-            <if test="param.status != null  and param.status.toString == 'TRIAL'">
-                AND em.status in (0)
-            </if>
-            -- 正式
-            <if test="param.status != null  and param.status.toString == 'FORMAL'">
-                AND em.status in (1)
-            </if>
-            -- 临时
-            <if test="param.status != null  and param.status.toString == 'TEMPORARY'">
-                AND em.status in (2)
-            </if>
-            -- 试用延期
-            <if test="param.status != null  and param.status.toString == 'DELAY'">
-                AND em.status in (3)
-            </if>
-            -- 解雇
-            <if test="param.status != null  and param.status.toString == 'FIRE'">
-                AND em.status in (4)
-            </if>
-            -- 离职
-            <if test="param.status != null  and param.status.toString == 'DEPARTURE'">
-                AND em.status in (5)
-            </if>
-            -- 退休
-            <if test="param.status != null  and param.status.toString == 'RETIRED'">
-                AND em.status in (6)
-            </if>
 
             union all
 
@@ -662,68 +621,6 @@
             <if test="param.workcode != null and param.workcode != ''">
                 AND extem.workcode like CONCAT('%',#{param.workcode},'%')
             </if>
-            -- 分部
-            <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
-                AND extem.subcompany_id IN
-                <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
-                    #{subcompanyId}
-                </foreach>
-            </if>
-            -- 部门
-            <if test="param.departmentIds != null and param.departmentIds.size()>0">
-                AND extem.department_id IN
-                <foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
-                    #{departmentId}
-                </foreach>
-            </if>
-            <if test="param.positionIds != null and param.positionIds.size()>0">
-                AND extem.jobtitle_id IN
-                <foreach collection="param.positionIds" open="(" item="positionId" separator="," close=")">
-                    #{positionId}
-                </foreach>
-            </if>
-            <if test="param.statuses != null and param.statuses.size()>0">
-                AND extem.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 extem.status in (0,1,2,3)
-            </if>
-            -- 离职(解雇，离职，退休)
-            <if test="param.status != null  and param.status.toString == 'UNAVAILABLE'">
-                AND extem.status in (4,5,6)
-            </if>
-            -- 试用
-            <if test="param.status != null  and param.status.toString == 'TRIAL'">
-                AND extem.status in (0)
-            </if>
-            -- 正式
-            <if test="param.status != null  and param.status.toString == 'FORMAL'">
-                AND extem.status in (1)
-            </if>
-            -- 临时
-            <if test="param.status != null  and param.status.toString == 'TEMPORARY'">
-                AND extem.status in (2)
-            </if>
-            -- 试用延期
-            <if test="param.status != null  and param.status.toString == 'DELAY'">
-                AND extem.status in (3)
-            </if>
-            -- 解雇
-            <if test="param.status != null  and param.status.toString == 'FIRE'">
-                AND extem.status in (4)
-            </if>
-            -- 离职
-            <if test="param.status != null  and param.status.toString == 'DEPARTURE'">
-                AND extem.status in (5)
-            </if>
-            -- 退休
-            <if test="param.status != null  and param.status.toString == 'RETIRED'">
-                AND extem.status in (6)
-            </if>
             )
         </if>
     </sql>
@@ -737,13 +634,34 @@
         <if test="param.taxAgentId != null">
             AND t.tax_agent_id = #{param.taxAgentId}
         </if>
+        -- 分部
+        <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
+            AND t.subcompany_id IN
+            <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
+                #{subcompanyId}
+            </foreach>
+        </if>
+        -- 部门
+        <if test="param.departmentIds != null and param.departmentIds.size()>0">
+            AND t.department_id IN
+            <foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
+                #{departmentId}
+            </foreach>
+        </if>
+        <if test="param.positionIds != null and param.positionIds.size()>0">
+            AND t.jobtitle_id IN
+            <foreach collection="param.positionIds" open="(" item="positionId" separator="," close=")">
+                #{positionId}
+            </foreach>
+        </if>
+        <if test="param.statuses != null and param.statuses.size()>0">
+            AND t.status IN
+            <foreach collection="param.statuses" open="(" item="userStatus" separator="," close=")">
+                #{userStatus}
+            </foreach>
+        </if>
         <if test="(param.employeeName != null and param.employeeName != '')
-             or (param.workcode != null and param.workcode != '')
-             or (param.subcompanyIds != null and param.subcompanyIds.size()>0)
-             or (param.departmentIds != null and param.departmentIds.size()>0) 
-             or (param.positionIds != null and param.positionIds.size()>0)
-             or (param.statuses != null and param.statuses.size()>0)
-             or (param.status != null and param.status.toString != 'ALL')">
+             or (param.workcode != null and param.workcode != '')">
             AND t.employee_id IN
             (
             SELECT id FROM hrmresource em WHERE em.status not in (7)
@@ -754,69 +672,7 @@
             <if test="param.workcode != null and param.workcode != ''">
                 AND em.workcode like '%'||#{param.workcode}||'%'
             </if>
-            <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
-                AND em.subcompanyid1 IN
-                <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
-                    #{subcompanyId}
-                </foreach>
-            </if>
-            <if test="param.departmentIds != null and param.departmentIds.size()>0">
-                AND em.departmentid IN
-                <foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
-                    #{departmentId}
-                </foreach>
-            </if>
-            <if test="param.positionIds != null and param.positionIds.size()>0">
-                AND em.jobtitle IN
-                <foreach collection="param.positionIds" open="(" item="positionId" separator="," close=")">
-                    #{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)
-            </if>
-            -- 离职(解雇，离职，退休)
-            <if test="param.status != null  and param.status.toString == 'UNAVAILABLE'">
-                AND em.status in (4,5,6)
-            </if>
-            -- 试用
-            <if test="param.status != null  and param.status.toString == 'TRIAL'">
-                AND em.status in (0)
-            </if>
-            -- 正式
-            <if test="param.status != null  and param.status.toString == 'FORMAL'">
-                AND em.status in (1)
-            </if>
-            -- 临时
-            <if test="param.status != null  and param.status.toString == 'TEMPORARY'">
-                AND em.status in (2)
-            </if>
-            -- 试用延期
-            <if test="param.status != null  and param.status.toString == 'DELAY'">
-                AND em.status in (3)
-            </if>
-            -- 解雇
-            <if test="param.status != null  and param.status.toString == 'FIRE'">
-                AND em.status in (4)
-            </if>
-            -- 离职
-            <if test="param.status != null  and param.status.toString == 'DEPARTURE'">
-                AND em.status in (5)
-            </if>
-            -- 退休
-            <if test="param.status != null  and param.status.toString == 'RETIRED'">
-                AND em.status in (6)
-            </if>
-
             union all
-
             SELECT id FROM hrsa_external_employee extem WHERE extem.status not in (7)
             <if test="param.employeeName != null and param.employeeName != ''">
                 AND extem.username LIKE '%'||#{param.employeeName}||'%'
@@ -824,66 +680,6 @@
             <if test="param.workcode != null and param.workcode != ''">
                 AND extem.workcode like '%'||#{param.workcode}||'%'
             </if>
-            <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
-                AND extem.subcompany_id IN
-                <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
-                    #{subcompanyId}
-                </foreach>
-            </if>
-            <if test="param.departmentIds != null and param.departmentIds.size()>0">
-                AND extem.department_id IN
-                <foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
-                    #{departmentId}
-                </foreach>
-            </if>
-            <if test="param.positionIds != null and param.positionIds.size()>0">
-                AND extem.jobtitle_id IN
-                <foreach collection="param.positionIds" open="(" item="positionId" separator="," close=")">
-                    #{positionId}
-                </foreach>
-            </if>
-            <if test="param.statuses != null and param.statuses.size()>0">
-                AND extem.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 extem.status in (0,1,2,3)
-            </if>
-            -- 离职(解雇，离职，退休)
-            <if test="param.status != null  and param.status.toString == 'UNAVAILABLE'">
-                AND extem.status in (4,5,6)
-            </if>
-            -- 试用
-            <if test="param.status != null  and param.status.toString == 'TRIAL'">
-                AND extem.status in (0)
-            </if>
-            -- 正式
-            <if test="param.status != null  and param.status.toString == 'FORMAL'">
-                AND extem.status in (1)
-            </if>
-            -- 临时
-            <if test="param.status != null  and param.status.toString == 'TEMPORARY'">
-                AND extem.status in (2)
-            </if>
-            -- 试用延期
-            <if test="param.status != null  and param.status.toString == 'DELAY'">
-                AND extem.status in (3)
-            </if>
-            -- 解雇
-            <if test="param.status != null  and param.status.toString == 'FIRE'">
-                AND extem.status in (4)
-            </if>
-            -- 离职
-            <if test="param.status != null  and param.status.toString == 'DEPARTURE'">
-                AND extem.status in (5)
-            </if>
-            -- 退休
-            <if test="param.status != null  and param.status.toString == 'RETIRED'">
-                AND extem.status in (6)
-            </if>
             )
         </if>
     </sql>
@@ -897,13 +693,34 @@
         <if test="param.taxAgentId != null">
             AND t.tax_agent_id = #{param.taxAgentId}
         </if>
+        -- 分部
+        <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
+            AND t.subcompany_id IN
+            <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
+                #{subcompanyId}
+            </foreach>
+        </if>
+        -- 部门
+        <if test="param.departmentIds != null and param.departmentIds.size()>0">
+            AND t.department_id IN
+            <foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
+                #{departmentId}
+            </foreach>
+        </if>
+        <if test="param.positionIds != null and param.positionIds.size()>0">
+            AND t.jobtitle_id IN
+            <foreach collection="param.positionIds" open="(" item="positionId" separator="," close=")">
+                #{positionId}
+            </foreach>
+        </if>
+        <if test="param.statuses != null and param.statuses.size()>0">
+            AND t.status IN
+            <foreach collection="param.statuses" open="(" item="userStatus" separator="," close=")">
+                #{userStatus}
+            </foreach>
+        </if>
         <if test="(param.employeeName != null and param.employeeName != '')
-             or (param.workcode != null and param.workcode != '')
-             or (param.subcompanyIds != null and param.subcompanyIds.size()>0)
-             or (param.departmentIds != null and param.departmentIds.size()>0) 
-             or (param.positionIds != null and param.positionIds.size()>0)
-             or (param.statuses != null and param.statuses.size()>0)
-             or (param.status != null and param.status.toString != 'ALL')">
+             or (param.workcode != null and param.workcode != '')">
             AND t.employee_id IN
             (
             SELECT id FROM hrmresource em WHERE em.status not in (7)
@@ -914,68 +731,6 @@
             <if test="param.workcode != null and param.workcode != ''">
                 AND em.workcode like '%'+#{param.workcode}+'%'
             </if>
-            <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
-                AND em.subcompanyid1 IN
-                <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
-                    #{subcompanyId}
-                </foreach>
-            </if>
-            <if test="param.departmentIds != null and param.departmentIds.size()>0">
-                AND em.departmentid IN
-                <foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
-                    #{departmentId}
-                </foreach>
-            </if>
-            <if test="param.positionIds != null and param.positionIds.size()>0">
-                AND em.jobtitle IN
-                <foreach collection="param.positionIds" open="(" item="positionId" separator="," close=")">
-                    #{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)
-            </if>
-
-            -- 离职(解雇，离职，退休)
-            <if test="param.status != null  and param.status.toString == 'UNAVAILABLE'">
-                AND em.status in (4,5,6)
-            </if>
-            -- 试用
-            <if test="param.status != null  and param.status.toString == 'TRIAL'">
-                AND em.status in (0)
-            </if>
-            -- 正式
-            <if test="param.status != null  and param.status.toString == 'FORMAL'">
-                AND em.status in (1)
-            </if>
-            -- 临时
-            <if test="param.status != null  and param.status.toString == 'TEMPORARY'">
-                AND em.status in (2)
-            </if>
-            -- 试用延期
-            <if test="param.status != null  and param.status.toString == 'POSTPONE'">
-                AND em.status in (3)
-            </if>
-            -- 解雇
-            <if test="param.status != null  and param.status.toString == 'FIRE'">
-                AND em.status in (4)
-            </if>
-            -- 离职
-            <if test="param.status != null  and param.status.toString == 'DEPARTURE'">
-                AND em.status in (5)
-            </if>
-            -- 退休
-            <if test="param.status != null  and param.status.toString == 'RETIRED'">
-                AND em.status in (6)
-            </if>
-
             union all
 
             SELECT id FROM hrsa_external_employee extem WHERE extem.status not in (7)
@@ -985,67 +740,6 @@
             <if test="param.workcode != null and param.workcode != ''">
                 AND extem.workcode like '%'+#{param.workcode}+'%'
             </if>
-            <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
-                AND extem.subcompany_id IN
-                <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
-                    #{subcompanyId}
-                </foreach>
-            </if>
-            <if test="param.departmentIds != null and param.departmentIds.size()>0">
-                AND extem.department_id IN
-                <foreach collection="param.departmentIds" open="(" item="departmentId" separator="," close=")">
-                    #{departmentId}
-                </foreach>
-            </if>
-            <if test="param.positionIds != null and param.positionIds.size()>0">
-                AND extem.jobtitle_id IN
-                <foreach collection="param.positionIds" open="(" item="positionId" separator="," close=")">
-                    #{positionId}
-                </foreach>
-            </if>
-            <if test="param.statuses != null and param.statuses.size()>0">
-                AND extem.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 extem.status in (0,1,2,3)
-            </if>
-
-            -- 离职(解雇，离职，退休)
-            <if test="param.status != null  and param.status.toString == 'UNAVAILABLE'">
-                AND extem.status in (4,5,6)
-            </if>
-            -- 试用
-            <if test="param.status != null  and param.status.toString == 'TRIAL'">
-                AND extem.status in (0)
-            </if>
-            -- 正式
-            <if test="param.status != null  and param.status.toString == 'FORMAL'">
-                AND extem.status in (1)
-            </if>
-            -- 临时
-            <if test="param.status != null  and param.status.toString == 'TEMPORARY'">
-                AND extem.status in (2)
-            </if>
-            -- 试用延期
-            <if test="param.status != null  and param.status.toString == 'POSTPONE'">
-                AND extem.status in (3)
-            </if>
-            -- 解雇
-            <if test="param.status != null  and param.status.toString == 'FIRE'">
-                AND extem.status in (4)
-            </if>
-            -- 离职
-            <if test="param.status != null  and param.status.toString == 'DEPARTURE'">
-                AND extem.status in (5)
-            </if>
-            -- 退休
-            <if test="param.status != null  and param.status.toString == 'RETIRED'">
-                AND extem.status in (6)
-            </if>
             )
         </if>
     </sql>
diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java
index 48ae48837..571884aa5 100644
--- a/src/com/engine/salary/web/SalaryAcctController.java
+++ b/src/com/engine/salary/web/SalaryAcctController.java
@@ -322,10 +322,6 @@ public class SalaryAcctController {
         if (StringUtils.isNotBlank(positionIds)) {
             param.setPositionIds(Arrays.stream(positionIds.split(",")).map(Long::valueOf).collect(Collectors.toList()));
         }
-        String status = request.getParameter("status");
-        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()));