From 63c747796672ff27403a31dcb58aba9382192422 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 26 Jun 2024 10:35:05 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=96=AA=E8=B5=84=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A0=B9=E6=8D=AE=E6=98=BE=E7=A4=BA=E5=88=97?=
 =?UTF-8?q?=E5=AE=9A=E5=88=B6=E5=AF=BC=E5=87=BA=202=E3=80=81=E8=96=AA?=
 =?UTF-8?q?=E8=B5=84=E6=A1=A3=E6=A1=88=20=E9=AB=98=E7=BA=A7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=94=AF=E6=8C=81=E4=B8=AA=E7=A8=8E=E6=89=A3=E7=BC=B4?=
 =?UTF-8?q?=E4=B9=89=E5=8A=A1=E4=BA=BA=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/SalaryArchiveQueryParam.java        |  2 ++
 .../mapper/archive/SalaryArchiveMapper.xml    | 27 +++++++++++++++++++
 ...aryStatisticsEmployeeSalaryQueryParam.java |  3 +++
 .../SalaryStatisticsEmployeeWrapper.java      | 10 +++++++
 4 files changed, 42 insertions(+)

diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
index 505ce3264..fd36884d3 100644
--- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
+++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
@@ -36,6 +36,8 @@ public class SalaryArchiveQueryParam extends BaseQueryParam {
 
     //个税扣缴义务人id
     private Long taxAgentId;
+
+    private List<Long> taxAgentIds;
     private String taxAgentName;
 
     //分部id
diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
index a1fa6af6b..951429b32 100644
--- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
+++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
@@ -136,6 +136,13 @@
         <if test="param.workcode != null and param.workcode != ''">
             AND e.workcode like CONCAT('%',#{param.workcode},'%')
         </if>
+        <!-- 个税扣缴义务人 -->
+        <if test="param.taxAgentIds != null and param.taxAgentIds.size()>0">
+            AND t.tax_agent_id IN
+            <foreach collection="param.taxAgentIds" open="(" item="taxAgentId" separator="," close=")">
+                #{taxAgentId}
+            </foreach>
+        </if>
         <!-- 分部 -->
         <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
             AND c.id IN
@@ -232,6 +239,13 @@
         <if test="param.workcode != null and param.workcode != ''">
             AND e.workcode like '%'||#{param.workcode}||'%'
         </if>
+        <!-- 个税扣缴义务人 -->
+        <if test="param.taxAgentIds != null and param.taxAgentIds.size()>0">
+            AND t.tax_agent_id IN
+            <foreach collection="param.taxAgentIds" open="(" item="taxAgentId" separator="," close=")">
+                #{taxAgentId}
+            </foreach>
+        </if>
         <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
             AND c.id IN
             <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
@@ -326,6 +340,13 @@
         <if test="param.workcode != null and param.workcode != ''">
             AND e.workcode like '%'+#{param.workcode}+'%'
         </if>
+        <!-- 个税扣缴义务人 -->
+        <if test="param.taxAgentIds != null and param.taxAgentIds.size()>0">
+            AND t.tax_agent_id IN
+            <foreach collection="param.taxAgentIds" open="(" item="taxAgentId" separator="," close=")">
+                #{taxAgentId}
+            </foreach>
+        </if>
         <if test="param.subcompanyIds != null and param.subcompanyIds.size()>0">
             AND c.id IN
             <foreach collection="param.subcompanyIds" open="(" item="subcompanyId" separator="," close=")">
@@ -430,6 +451,12 @@
         <if test="param.taxAgentId != null">
             AND t.tax_agent_id = #{param.taxAgentId}
         </if>
+        <if test="param.taxAgentIds != null and param.taxAgentIds.size()>0">
+            AND t.tax_agent_id IN
+            <foreach collection="param.taxAgentIds" open="(" item="taxAgentId" separator="," close=")">
+                #{taxAgentId}
+            </foreach>
+        </if>
         <!-- 姓名 -->
         <if test="param.username != null and param.username != ''">
             AND e.username like CONCAT('%',#{param.username},'%')
diff --git a/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java b/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java
index 13108c0be..a1dbab11b 100644
--- a/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java
+++ b/src/com/engine/salary/report/entity/param/SalaryStatisticsEmployeeSalaryQueryParam.java
@@ -47,4 +47,7 @@ public class SalaryStatisticsEmployeeSalaryQueryParam extends BaseQueryParam {
 
     // 部分导出id
     private List<Long> ids;
+
+    // 导出时显示列定制信息
+    List<String> columns;
 }
\ No newline at end of file
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
index 1350df88a..e3f794637 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsEmployeeWrapper.java
@@ -20,6 +20,7 @@ import com.engine.salary.report.entity.param.SalaryStatisticsEmployeeSalaryQuery
 import com.engine.salary.report.service.SalaryStatisticsEmployeeService;
 import com.engine.salary.report.service.impl.SalaryStatisticsEmployeeServiceImpl;
 import com.engine.salary.report.util.ReportDataUtil;
+import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.excel.ExcelUtilPlus;
 import com.engine.salary.util.page.PageInfo;
@@ -264,6 +265,15 @@ public class SalaryStatisticsEmployeeWrapper extends Service {
         List<Map<String, Object>> resultList = ((PageInfo<Map<String, Object>>) resultMap.get("pageInfo")).getList();
         Map<String, Object> countResult = (Map<String, Object>)resultMap.get("countResult");
 
+        Map<String, WeaTableColumn> columnMap = SalaryEntityUtil.convert2Map(columns, WeaTableColumn::getColumn);
+        List<WeaTableColumn> finalColumns = new ArrayList<>();
+        queryParam.getColumns().forEach(col -> {
+            WeaTableColumn column = columnMap.get(col);
+            if (column != null) {
+                finalColumns.add(column);
+            }
+        });
+        columns = finalColumns;
         List<List<Object>> rowList = new ArrayList<>();
         // 表头
         rowList.add(columns.stream().map(WeaTableColumn::getText).collect(Collectors.toList()));