From 6214c1261bdc72caef3b29b593be80f004f55388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 21 Mar 2023 10:12:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/req/purchase/PurOrderRequest.java   | 4 ++--
 .../com/glxp/api/res/purchase/PurOrderDetailResponse.java | 1 +
 .../resources/mybatis/mapper/purchase/PurOrderDao.xml     | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java
index 8a5afc89..a4ea787a 100644
--- a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java
@@ -95,7 +95,7 @@ public class PurOrderRequest extends ListPageRequest {
     private String emergency;
     private Date arrivalTime;
 
-    private Date startAuditDate;
-    private Date endAuditDate;
+    private String startAuditDate;
+    private String endAuditDate;
 
 }
diff --git a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java
index a6e5d488..c4c2f2c6 100644
--- a/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java
+++ b/src/main/java/com/glxp/api/res/purchase/PurOrderDetailResponse.java
@@ -17,6 +17,7 @@ public class PurOrderDetailResponse {
     private String productDate;
     private Integer count;
     private int reCount;
+    private int planCount;
     private Integer sweepCount;
     private String ylqxzcrbarmc;
     private String zczbhhzbapzbh;
diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml
index 4d505de0..b5efe840 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml
@@ -53,16 +53,16 @@
         AND billNo = #{billNo}
       </if>
       <if test="startDate != null and startDate !=''">
-        <![CDATA[ and DATE_FORMAT(createTime,'%Y-%m-%d')>= #{startDate}]]>
+        <![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d')>= #{startDate}]]>
       </if>
       <if test="endDate != null and endDate !=''">
-        <![CDATA[ and DATE_FORMAT(createTime,'%Y-%m-%d') <= #{endDate}]]>
+        <![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d') <= #{endDate}]]>
       </if>
       <if test="startAuditDate != null and startAuditDate !=''">
-        <![CDATA[ and DATE_FORMAT(auditTime,'%Y-%m-%d')>= #{startAuditDate}]]>
+        <![CDATA[ and DATE_FORMAT(pur_order.auditTime,'%Y-%m-%d')>= #{startAuditDate}]]>
       </if>
       <if test="endAuditDate != null and endAuditDate !=''">
-        <![CDATA[ and DATE_FORMAT(auditTime,'%Y-%m-%d') <= #{endAuditDate}]]>
+        <![CDATA[ and DATE_FORMAT(pur_order.auditTime,'%Y-%m-%d') <= #{endAuditDate}]]>
       </if>
       <if test="status!=null and status!=10 and status!=11">
         and pur_order.status = #{status}