From 6473840e17240877a5e1f6da461c6df8698574cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 20 Jul 2023 17:40:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=B4=AD=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/purchase/PurApplyController.java    |  9 +++++++++
 .../com/glxp/api/req/purchase/PurApplyRequest.java     |  5 +++++
 .../resources/mybatis/mapper/purchase/PurApplyDao.xml  | 10 ++++++----
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
index 92240498..1ebb42d7 100644
--- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
+++ b/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);
diff --git a/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java b/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java
index 1e898137..01d1c3b9 100644
--- a/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java
+++ b/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;
+
 }
diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml
index 663cccb5..c6e01ff3 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml
+++ b/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