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 @@
AND NotifyNo = #{query.notifyNo}
-
+
AND NotifyDate >= #{query.notifyDateStart}
-
+
AND #{query.notifyDateEnd} >= NotifyDate
@@ -24,10 +24,10 @@
AND IfsPickListNo = #{query.ifsPickListNo}
-
+
AND NeedDate >= #{query.needDateStart}
-
+
AND #{query.needDateEnd} >= NeedDate