From 387b6a2897eb59d967b52229b173379904d48af3 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 31 Aug 2022 15:06:49 +0800
Subject: [PATCH] =?UTF-8?q?xzy-=E5=9C=A8=E8=96=AA=E8=B5=84=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E4=BB=A5=E5=8F=8A=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97?=
 =?UTF-8?q?=E7=9A=84=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E4=B8=AD,?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E9=83=A8=E6=90=9C=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/SalaryAcctEmployeeQueryParam.java   |  5 +++-
 .../param/SalaryAcctResultQueryParam.java     |  3 +++
 .../param/SalaryArchiveQueryParam.java        |  3 +++
 .../mapper/archive/SalaryArchiveMapper.xml    | 19 ++++++++++++++
 .../salaryacct/SalaryAcctEmployeeMapper.xml   | 25 +++++++++++++++++++
 .../impl/SalaryArchiveServiceImpl.java        |  1 +
 6 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
index 27eb89f4b..fcfa1a4e4 100644
--- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
+++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
@@ -7,6 +7,7 @@ import com.engine.salary.util.valid.DataCheck;
 import lombok.*;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * 薪资核算人员列表查询条件
@@ -33,11 +34,13 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam {
     //个税扣缴义务人")
     private Long taxAgentId;
 
+    //分部
+    private List<Long> subcompanyIds;
+
     //部门")
     private Collection<Long> departmentIds;
 
 
-
     //岗位")
     private Collection<Long> positionIds;
 
diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java
index cd8ea51b6..dd49ccb6c 100644
--- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java
+++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java
@@ -35,6 +35,9 @@ public class SalaryAcctResultQueryParam extends BaseQueryParam {
     //个税扣缴义务人
     private Long taxAgentId;
 
+    //分部
+    private Collection<Long> subcompanyIds;
+
     //部门
     private Collection<Long> departmentIds;
 
diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
index 599a48d9d..268f31fde 100644
--- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
+++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
@@ -32,6 +32,9 @@ public class SalaryArchiveQueryParam extends BaseQueryParam {
     //个税扣缴义务人id
     private Long taxAgentId;
 
+    //分部id
+    private List<Long> subcompanyIds;
+
     //部门id
     private List<Long> departmentIds;
 
diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
index 4b7f0c8a4..5381fd7b2 100644
--- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
+++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
@@ -118,6 +118,13 @@
         <if test="param.username != null and param.username != ''">
             AND e.lastname like CONCAT('%',#{param.username},'%')
         </if>
+        <!-- 分部 -->
+        <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
+            AND c.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 d.id IN
@@ -169,6 +176,12 @@
         <if test="param.username != null and param.username != ''">
             AND e.lastname like '%'||#{param.username}||'%'
         </if>
+        <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
+            AND c.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 d.id IN
             <foreach collection="param.departmentIds" open="(" item="id" separator="," close=")">
@@ -220,6 +233,12 @@
         <if test="param.username != null and param.username != ''">
             AND e.lastname like '%'+#{param.username}+'%'
         </if>
+        <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
+            AND c.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 d.id IN
             <foreach collection="param.departmentIds" open="(" item="id" separator="," close=")">
diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
index 060e48e56..21d33debf 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
@@ -497,6 +497,7 @@
             AND tax_agent_id = #{param.taxAgentId}
         </if>
         <if test="(param.employeeName != null and param.employeeName != '')
+            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.status != null and param.status != 'ALL')">
@@ -507,6 +508,13 @@
             <if test="param.employeeName != null and param.employeeName != ''">
                 AND em.lastname LIKE '%'||#{param.employeeName}||'%'
             </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=")">
@@ -552,6 +560,7 @@
             AND tax_agent_id = #{param.taxAgentId}
         </if>
         <if test="(param.employeeName != null and param.employeeName != '')
+            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.status != null and param.status != 'ALL')">
@@ -562,6 +571,13 @@
             <if test="param.employeeName != null and param.employeeName != ''">
                 AND em.lastname LIKE '%'+#{param.employeeName}+'%'
             </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=")">
@@ -719,6 +735,7 @@
             AND tax_agent_id = #{param.taxAgentId}
         </if>
         <if test="(param.employeeName != null and param.employeeName != '')
+            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.status != null and param.status != 'ALL')">
@@ -729,6 +746,14 @@
             <if test="param.employeeName != null and param.employeeName != ''">
                 AND em.lastname LIKE CONCAT('%',#{param.employeeName},'%')
             </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=")">
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
index 5fcae6a5a..c4753247c 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
@@ -131,6 +131,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
                 return pageInfo;
             }
 
+            // 获取作为管理员的所有个税扣缴义务人列表
             Collection<TaxAgentPO> taxAgentPOS = getTaxAgentService(user).listAllTaxAgentsAsAdmin(currentEmployeeId);
             Set<Long> taxAgentIds = SalaryEntityUtil.properties(taxAgentPOS, TaxAgentPO::getId);