申购查询代码提交

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

@@ -121,6 +121,16 @@ public class PurApplyEntity {
     @TableField(value = "generatePlan")
     private boolean generatePlan;
 
+
+    @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/PurApplyRequest.java

@@ -103,5 +103,8 @@ public class PurApplyRequest extends ListPageRequest {
     private boolean audtoPlan;
 
     private Integer applyType;
-
+    private Integer emergency;
+    private Date arrivalTime;
+    private String startAuditDate;
+    private String endAuditDate;
 }

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

@@ -1,5 +1,6 @@
 package com.glxp.api.res.purchase;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.Date;
@@ -77,6 +78,7 @@ public class PurApplyResponse {
     private String planBillNo;      //生成采购计划单据号
     private boolean generatePlan;
     private boolean audtoPlan;  ///
-
+    private Integer emergency;
+    private Date arrivalTime;
 
 }

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

@@ -22,10 +22,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_apply.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_apply.createTime,'%Y-%m-%d') <= #{endDate}]]>
+            </if>
+            <if test="startAuditDate != null and startAuditDate !=''">
+                <![CDATA[ and DATE_FORMAT(pur_apply.auditTime,'%Y-%m-%d')>= #{startAuditDate}]]>
+            </if>
+            <if test="endAuditDate != null and endAuditDate !=''">
+                <![CDATA[ and DATE_FORMAT(pur_apply.auditTime,'%Y-%m-%d') <= #{endAuditDate}]]>
             </if>
             <if test="status!=null and status!=10 and status!=11">
                 and pur_apply.status = #{status}
@@ -43,6 +49,12 @@
             <if test="invCode != '' and invCode != null">
                 AND invCode = #{invCode}
             </if>
+            <if test="targetInvCode != '' and targetInvCode != null">
+                AND targetInvCode = #{targetInvCode}
+            </if>
+            <if test="targetDeptCode != '' and targetDeptCode != null">
+                AND targetDeptCode = #{targetDeptCode}
+            </if>
             <if test="auditUser != '' and auditUser != null">
                 AND auditUser = #{auditUser}
             </if>
@@ -62,7 +74,8 @@
         INTO  pur_apply
         (
         billNo,billDate,status,billType,remark,invCode,
-        deptCode,createUser,createTime,auditUser,auditTime,updateTime,updateUser ,auditRemark,targetInvCode,targetDeptCode,planBillNo,generatePlan
+        deptCode,createUser,createTime,auditUser,auditTime,updateTime,updateUser ,auditRemark,
+        targetInvCode,targetDeptCode,planBillNo,generatePlan,emergency,arrivalTime
         )
         values (
         #{billNo},
@@ -81,7 +94,8 @@
         #{auditRemark},
         #{targetInvCode},
         #{targetDeptCode},
-        #{planBillNo},#{generatePlan}
+        #{planBillNo},#{generatePlan},
+        #{emergency},#{arrivalTime}
         )
     </insert>
 
@@ -122,6 +136,8 @@
             <if test="targetDeptCode != null">targetDeptCode=#{targetDeptCode},</if>
             <if test="planBillNo != null">planBillNo=#{planBillNo},</if>
             <if test="generatePlan != null">generatePlan=#{generatePlan},</if>
+            <if test="emergency != null">emergency=#{emergency},</if>
+            <if test="arrivalTime != null">arrivalTime=#{arrivalTime},</if>
         </trim>
         WHERE id = #{id}
     </update>