From d5671b391b198f2927ff49eea0b933e5cb406915 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Mon, 7 Apr 2025 16:30:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E8=B4=A7=E5=8D=95=E5=8F=91=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/orderIssure/entity/IssureNotifyEntity.java    | 4 ++++
 .../resources/mapper/orderIssure/IssureNotifyMapper.xml   | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/srq/modules/orderIssure/entity/IssureNotifyEntity.java b/src/main/java/com/srq/modules/orderIssure/entity/IssureNotifyEntity.java
index af8b671..cd06fc3 100644
--- a/src/main/java/com/srq/modules/orderIssure/entity/IssureNotifyEntity.java
+++ b/src/main/java/com/srq/modules/orderIssure/entity/IssureNotifyEntity.java
@@ -82,9 +82,13 @@ public class IssureNotifyEntity extends QueryPage implements Serializable{
     private String orderNo;
 
     @TableField(exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date notifyDateStart;
 
     @TableField(exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date notifyDateEnd;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")
diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
index 8f2cf42..dac67a9 100644
--- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
+++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
@@ -12,10 +12,10 @@
             <if test="query.notifyNo != null and query.notifyNo != ''">
                 AND NotifyNo = #{query.notifyNo}
             </if>
-            <if test="query.notifyDateStart != null and query.notifyDateStart != ''">
+            <if test="query.notifyDateStart != null">
                 AND NotifyDate >= #{query.notifyDateStart}
             </if>
-            <if test="query.notifyDateEnd != null and query.notifyDateEnd != ''">
+            <if test="query.notifyDateEnd != null">
                 AND #{query.notifyDateEnd} >= NotifyDate
             </if>
             <if test="query.orderNo != null and query.orderNo != ''">
@@ -24,10 +24,10 @@
             <if test="query.ifsPickListNo != null and query.ifsPickListNo != ''">
                 AND IfsPickListNo = #{query.ifsPickListNo}
             </if>
-            <if test="query.needDateStart != null and query.needDateStart != ''">
+            <if test="query.needDateStart != null">
                 AND NeedDate >= #{query.needDateStart}
             </if>
-            <if test="query.needDateEnd != null and query.needDateEnd != ''">
+            <if test="query.needDateEnd != null">
                 AND #{query.needDateEnd} >= NeedDate
             </if>
             <if test="query.status != null and query.status != ''">