采购订单查询代码提交

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;
 
 }

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;

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}