diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java index 0c56735f..1669fbcb 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java +++ b/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"; 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 8532a5d1..8a5afc89 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java +++ b/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; } diff --git a/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java b/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java index 0969060c..93294cb3 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java +++ b/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; } diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml index fdb2d644..4d505de0 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml @@ -53,10 +53,16 @@ AND billNo = #{billNo} - = #{startDate}]]> + = #{startDate}]]> - + + + + = #{startAuditDate}]]> + + + and pur_order.status = #{status}