采购订单查询代码提交

src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java

@@ -127,6 +127,18 @@ public class PurOrderEntity {
     @TableField(value = "stockOrderNo")
     private String stockOrderNo;
 
+    /**
+     * 紧急情况
+     */
+    @TableField(value = "emergency")
+    private String emergency;
+
+    /**
+     * 到货时间
+     */
+    @TableField(value = "arrivalTime")
+    private Date arrivalTime;
+
     public static final String COL_ID = "id";
 
     public static final String COL_BILLNO = "billNo";

src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java

@@ -92,5 +92,10 @@ public class PurOrderRequest extends ListPageRequest {
 
     private Long applyId;
 
+    private String emergency;
+    private Date arrivalTime;
+
+    private Date startAuditDate;
+    private Date endAuditDate;
 
 }

src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java

@@ -1,5 +1,6 @@
 package com.glxp.api.res.purchase;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.Date;
@@ -71,4 +72,8 @@ public class PurOrderResponse {
 
     private String createUserName;
     private String auditUserName;
+
+    private String emergency;
+
+    private Date arrivalTime;
 }

src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml

@@ -53,10 +53,16 @@
         AND billNo = #{billNo}
       </if>
       <if test="startDate != null and startDate !=''">
-        <![CDATA[ and DATE_FORMAT(billDate,'%Y-%m-%d')>= #{startDate}]]>
+        <![CDATA[ and DATE_FORMAT(createTime,'%Y-%m-%d')>= #{startDate}]]>
       </if>
       <if test="endDate != null and endDate !=''">
-        <![CDATA[ and DATE_FORMAT(billDate,'%Y-%m-%d') <= #{endDate}]]>
+        <![CDATA[ and DATE_FORMAT(createTime,'%Y-%m-%d') <= #{endDate}]]>
+      </if>
+      <if test="startAuditDate != null and startAuditDate !=''">
+        <![CDATA[ and DATE_FORMAT(auditTime,'%Y-%m-%d')>= #{startAuditDate}]]>
+      </if>
+      <if test="endAuditDate != null and endAuditDate !=''">
+        <![CDATA[ and DATE_FORMAT(auditTime,'%Y-%m-%d') <= #{endAuditDate}]]>
       </if>
       <if test="status!=null and status!=10 and status!=11">
         and pur_order.status = #{status}