Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/purchase/PurApplyController.java

@@ -10,6 +10,7 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.constant.ConstantType;
+import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
 import com.glxp.api.entity.basic.BasicProductsEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
@@ -115,6 +116,10 @@ public class PurApplyController {
         if (purApplyRequest.getStatus() == null) {
             purApplyRequest.setStatus(11);  //查询未审核和草稿状态
         }
+        if(purApplyRequest.getIsUser() != null && purApplyRequest.getIsUser()){
+            AuthAdmin authAdmin=customerService.getUserBean();
+            purApplyRequest.setCreateUser(authAdmin.getId() + ""); //查询自己
+        }
 
         List<PurApplyResponse> purApplyEntities = purApplyService.queryPageList(purApplyRequest);
         PageInfo<PurApplyResponse> pageInfo;
@@ -136,6 +141,10 @@ public class PurApplyController {
         if (purApplyRequest.getStatus() == null) {
             purApplyRequest.setStatus(10);  //查询未审核和已审核状态
         }
+        if(purApplyRequest.getIsInvCode()!=null && purApplyRequest.getIsInvCode()){
+            AuthAdmin authAdmin=customerService.getUserBean();
+            purApplyRequest.setInvCode(authAdmin.getLocInvCode() + ""); //查询自己仓库
+        }
         List<PurApplyResponse> purApplyEntities = purApplyService.queryPageList(purApplyRequest);
         PageInfo<PurApplyResponse> pageInfo;
         pageInfo = new PageInfo<>(purApplyEntities);

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

@@ -108,4 +108,9 @@ public class PurApplyRequest extends ListPageRequest {
     private String startAuditDate;
     private String endAuditDate;
     private String orderBy;
+
+
+    private Boolean isUser;
+    private Boolean isInvCode;
+
 }

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

@@ -42,7 +42,7 @@
                 and DATE_FORMAT(pur_apply.auditTime, '%Y-%m-%d') <= #{endAuditDate}
                 ]]>
             </if>
-            <if test="status != null and status != 10 and status != 11">
+            <if test="status != null and status != 10 and status != 11 and status != 12">
                 and pur_apply.status = #{status}
             </if>
             <if test="status == 10">
@@ -51,12 +51,14 @@
             <if test="status == 11">
                 and (pur_apply.status = 1 or pur_apply.status = 2 or pur_apply.status = 4)
             </if>
-
+            <if test="status == 12">
+                and (pur_apply.status = 3 or pur_apply.status = 4)
+            </if>
             <if test="deptCode != '' and deptCode != null">
                 AND deptCode = #{deptCode}
             </if>
             <if test="invCode != '' and invCode != null">
-                AND invCode = #{invCode}
+                AND pur_apply.invCode = #{invCode}
             </if>
             <if test="targetInvCode != '' and targetInvCode != null">
                 AND targetInvCode = #{targetInvCode}
@@ -68,7 +70,7 @@
                 AND auditUser = #{auditUser}
             </if>
             <if test="createUser != '' and createUser != null">
-                AND createUser = #{createUser}
+                AND pur_apply.createUser = #{createUser}
             </if>
             <if test="applyType != null">
                 AND generatePlan = 1