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} - = #{startDate}]]> + = #{startDate}]]> - + - = #{startAuditDate}]]> + = #{startAuditDate}]]> - + and pur_order.status = #{status}