计划查询代码提交

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

@@ -127,6 +127,15 @@ public class PurOrderEntity {
     @TableField(value = "stockOrderNo")
     private String stockOrderNo;
 
+    @TableField(value = "emergency")
+    private Integer 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/entity/purchase/PurPlanEntity.java

@@ -127,6 +127,15 @@ public class PurPlanEntity {
     @TableField(value = "stockOrderNo")
     private String stockOrderNo;
 
+    @TableField(value = "emergency")
+    private Integer 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

@@ -91,7 +91,10 @@ public class PurOrderRequest extends ListPageRequest {
     private String endDate;
 
     private  Long applyId;
-
+    private Integer emergency;
+    private Date arrivalTime;
+    private String startAuditDate;
+    private String endAuditDate;
 
 
 

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

@@ -91,7 +91,10 @@ public class PurPlanRequest extends ListPageRequest {
     private String endDate;
 
     private  Long applyId;
-
+    private Integer emergency;
+    private Date arrivalTime;
+    private String startAuditDate;
+    private String endAuditDate;
 
 
 

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

@@ -71,4 +71,6 @@ public class PurOrderResponse {
 
     private String createUserName;
     private String auditUserName;
+    private Integer emergency;
+    private Date arrivalTime;
 }

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

@@ -71,4 +71,6 @@ public class PurPlanResponse {
 
     private String createUserName;
     private String auditUserName;
+    private Integer 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(pur_order.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(pur_order.createTime,'%Y-%m-%d') <= #{endDate}]]>
+      </if>
+      <if test="startAuditDate != null and startAuditDate !=''">
+        <![CDATA[ and DATE_FORMAT(pur_order.auditTime,'%Y-%m-%d')>= #{startAuditDate}]]>
+      </if>
+      <if test="endAuditDate != null and 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}

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

@@ -23,10 +23,16 @@
                 AND billNo = #{billNo}
             </if>
             <if test="startDate != null and startDate !=''">
-                <![CDATA[ and DATE_FORMAT(billDate,'%Y-%m-%d')>= #{startDate}]]>
+                <![CDATA[ and DATE_FORMAT(pur_plan.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(pur_plan.createTime,'%Y-%m-%d') <= #{endDate}]]>
+            </if>
+            <if test="startAuditDate != null and startAuditDate !=''">
+                <![CDATA[ and DATE_FORMAT(pur_plan.auditTime,'%Y-%m-%d')>= #{startAuditDate}]]>
+            </if>
+            <if test="endAuditDate != null and endAuditDate !=''">
+                <![CDATA[ and DATE_FORMAT(pur_plan.auditTime,'%Y-%m-%d') <= #{endAuditDate}]]>
             </if>
             <if test="status!=null and status!=10 and status!=11">
                 and pur_plan.status = #{status}
@@ -63,7 +69,7 @@
         (
         billNo,billDate,status,billType,remark,invCode,
         deptCode,createUser,createTime,auditUser,auditTime,updateTime,auditRemark
-        ,applyCreateUser,applyAuditUser,applyRemark,applyBillNo,stockOrderNo
+        ,applyCreateUser,applyAuditUser,applyRemark,applyBillNo,stockOrderNo,emergency,arrivalTime
         )
         values (
         #{billNo},
@@ -83,7 +89,8 @@
         #{applyAuditUser},
         #{applyRemark},
         #{applyBillNo},
-        #{stockOrderNo}
+        #{stockOrderNo},
+        #{emergency},#{arrivalTime}
         )
     </insert>
 
@@ -120,6 +127,8 @@
             <if test="applyRemark != null">applyRemark=#{applyRemark},</if>
             <if test="applyBillNo != null">applyBillNo=#{applyBillNo},</if>
             <if test="stockOrderNo != null">stockOrderNo=#{stockOrderNo},</if>
+            <if test="emergency != null">emergency=#{emergency},</if>
+            <if test="arrivalTime != null">arrivalTime=#{arrivalTime},</if>
         </trim>
         WHERE id = #{id}
     </update>