From 246ab69a7ab1a520fa021f66c41a67e13e1f9649 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Wed, 17 Jan 2024 16:26:19 +0800
Subject: [PATCH] =?UTF-8?q?2024.1.17=20=E8=B4=A8=E9=87=8F=E2=80=94?=
 =?UTF-8?q?=E2=80=94=E6=A3=80=E9=AA=8C=E2=80=94=E2=80=94=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=9A=E4=BB=BB=E5=8A=A1=E7=94=9F=E6=88=90=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E2=86=92=E9=80=81=E6=A3=80=E6=97=A5=E6=9C=9F=20+=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=88=E9=80=81=E6=A3=80=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/data/QcFAIRecordData.java | 27 ++++++++++++++++++-
 src/main/resources/mapper/pms/QcMapper.xml    | 24 +++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
index f71f7d90..5bf64652 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcFAIRecordData.java
@@ -25,10 +25,35 @@ public class QcFAIRecordData extends QueryPage {
     private String supplierDesc;
     // 检验结果
     private String inspectionResult;
-    // 任务生成日期
+    // 送检日期
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date taskDate;
+
+    public Date getStartDate2() {
+        return startDate2;
+    }
+
+    public void setStartDate2(Date startDate2) {
+        this.startDate2 = startDate2;
+    }
+
+    public Date getEndDate2() {
+        return endDate2;
+    }
+
+    public void setEndDate2(Date endDate2) {
+        this.endDate2 = endDate2;
+    }
+
+    // 送检日期(最大)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date startDate2;
+    // 送检日期(最小)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date endDate2;
     // 检验任务日期(最大)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index b7bdb94a..5ac9ef10 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -1584,6 +1584,12 @@
             <if test="query.endDate != null">
                 AND #{query.endDate} >= inspector_date
             </if>
+            <if test="query.startDate2 != null">
+                AND task_date >= #{query.startDate2}
+            </if>
+            <if test="query.endDate2 != null">
+                AND #{query.endDate2} >= task_date
+            </if>
         </where>
         ORDER BY
         CASE WHEN state = '待检验' THEN 1
@@ -1896,6 +1902,12 @@
             <if test="query.endDate != null">
                 AND #{query.endDate} >= inspector_date
             </if>
+            <if test="query.startDate2 != null">
+                AND task_date >= #{query.startDate2}
+            </if>
+            <if test="query.endDate2 != null">
+                AND #{query.endDate2} >= task_date
+            </if>
         </where>
         ORDER BY
         CASE WHEN state = '待检验' THEN 1
@@ -2230,6 +2242,12 @@
             <if test="query.endDate != null">
                 AND #{query.endDate} >= inspector_date
             </if>
+            <if test="query.startDate2 != null">
+                AND create_date >= #{query.startDate2}
+            </if>
+            <if test="query.endDate2 != null">
+                AND #{query.endDate2} >= create_date
+            </if>
         </where>
         ORDER BY
         CASE WHEN state = '待检验' THEN 1
@@ -2548,6 +2566,12 @@
             <if test="query.endDate != null">
                 AND #{query.endDate} >= inspector_date
             </if>
+            <if test="query.startDate2 != null">
+                AND task_date >= #{query.startDate2}
+            </if>
+            <if test="query.endDate2 != null">
+                AND #{query.endDate2} >= task_date
+            </if>
         </where>
         ORDER BY
         CASE WHEN state = '待检验' THEN 1