From e38fd9be992244d5aeb32b36fdda0d9bdc7004f9 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Mon, 15 Jan 2024 10:51:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A1=A3=E6=A1=88=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=B5=B7=E5=A7=8B=E3=80=81=E7=BB=93=E6=9D=9F=E5=8F=91?=
 =?UTF-8?q?=E8=96=AA=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/SalaryArchiveQueryParam.java        | 22 ++++++++++++
 .../mapper/archive/SalaryArchiveMapper.xml    | 36 +++++++++++++++++++
 .../impl/SalaryArchiveServiceImpl.java        | 13 +++++++
 3 files changed, 71 insertions(+)

diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
index 12a02998d..505ce3264 100644
--- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
+++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java
@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -88,4 +89,25 @@ public class SalaryArchiveQueryParam extends BaseQueryParam {
      */
     private boolean extSalaryArchiveList;
 
+
+    private String payStartDateStartDateStr;
+    private String payStartDateEndDateStr;
+
+    // 起始发薪日期起
+    private Date payStartDateStartDate;
+
+    // 起始发薪日期止
+    private Date payStartDateEndDate;
+
+    // 最后发薪日期起
+    private String payEndDateStartDateStr;
+    // 最后发薪日期止
+    private String payEndDateEndDateStr;
+
+    // 最后发薪日期起
+    private Date payEndDateStartDate;
+
+    // 最后发薪日期止
+    private Date payEndDateEndDate;
+
 }
diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
index 03facc683..ea4f6498b 100644
--- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
+++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
@@ -183,6 +183,18 @@
                 #{runStatus}
             </foreach>
         </if>
+        <if test="param.payStartDateStartDate != null and param.payStartDateStartDate != null">
+            AND pay_start_date <![CDATA[ >= ]]> #{param.payStartDateStartDate}
+        </if>
+        <if test="param.payStartDateEndDate != null and param.payStartDateEndDate != null">
+            AND pay_start_date <![CDATA[ <= ]]> #{param.payStartDateEndDate}
+        </if>
+        <if test="param.payEndDateStartDate != null and param.payEndDateStartDate != null">
+            AND pay_end_date <![CDATA[ >= ]]> #{param.payEndDateStartDate}
+        </if>
+        <if test="param.payEndDateEndDate != null and param.payEndDateEndDate != null">
+            AND pay_end_date <![CDATA[ <= ]]> #{param.payEndDateEndDate}
+        </if>
         <!-- 排序 -->
         <if test="param.orderRule != null">
             ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}
@@ -264,6 +276,18 @@
                 #{runStatus}
             </foreach>
         </if>
+        <if test="param.payStartDateStartDate != null and param.payStartDateStartDate != null">
+            AND pay_start_date <![CDATA[ >= ]]> #{param.payStartDateStartDate}
+        </if>
+        <if test="param.payStartDateEndDate != null and param.payStartDateEndDate != null">
+            AND pay_start_date <![CDATA[ >= ]]> #{param.payStartDateEndDate}
+        </if>
+        <if test="param.payEndDateStartDate != null and param.payEndDateStartDate != null">
+            AND pay_end_date <![CDATA[ >= ]]> #{param.payEndDateStartDate}
+        </if>
+        <if test="param.payEndDateEndDate != null and param.payEndDateEndDate != null">
+            AND pay_end_date <![CDATA[ >= ]]> #{param.payEndDateEndDate}
+        </if>
         <!-- 排序 -->
         <if test="param.orderRule != null">
             ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}
@@ -346,6 +370,18 @@
                 #{runStatus}
             </foreach>
         </if>
+        <if test="param.payStartDateStartDate != null and param.payStartDateStartDate != null">
+            AND pay_start_date <![CDATA[ >= ]]> #{param.payStartDateStartDate}
+        </if>
+        <if test="param.payStartDateEndDate != null and param.payStartDateEndDate != null">
+            AND pay_start_date <![CDATA[ >= ]]> #{param.payStartDateEndDate}
+        </if>
+        <if test="param.payEndDateStartDate != null and param.payEndDateStartDate != null">
+            AND pay_end_date <![CDATA[ >= ]]> #{param.payEndDateStartDate}
+        </if>
+        <if test="param.payEndDateEndDate != null and param.payEndDateEndDate != null">
+            AND pay_end_date <![CDATA[ >= ]]> #{param.payEndDateEndDate}
+        </if>
         <!-- 排序 -->
         <if test="param.orderRule != null">
             ORDER BY ${param.orderRule.orderRule} ${param.orderRule.ascOrDesc}
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
index 5ba7bd575..1fbe1b525 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
@@ -163,6 +163,19 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe
         if (queryParam.isExtSalaryArchiveList()) {
             return getSalaryArchiveMapper().listExtSalaryArchive(queryParam);
         }
+        if (StringUtils.isNotBlank(queryParam.getPayStartDateStartDateStr())) {
+            queryParam.setPayStartDateStartDate(SalaryDateUtil.stringToDate(queryParam.getPayStartDateStartDateStr()));
+        }
+        if (Objects.nonNull(queryParam.getPayStartDateEndDateStr())) {
+            queryParam.setPayStartDateEndDate(SalaryDateUtil.stringToDate(queryParam.getPayStartDateEndDateStr()));
+        }
+
+        if (StringUtils.isNotBlank(queryParam.getPayEndDateStartDateStr())) {
+            queryParam.setPayEndDateStartDate(SalaryDateUtil.stringToDate(queryParam.getPayEndDateStartDateStr()));
+        }
+        if (Objects.nonNull(queryParam.getPayEndDateEndDateStr())) {
+            queryParam.setPayEndDateEndDate(SalaryDateUtil.stringToDate(queryParam.getPayEndDateEndDateStr()));
+        }
         return getSalaryArchiveMapper().list(queryParam);
     }