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 922404986..1ebb42d75 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 purApplyEntities = purApplyService.queryPageList(purApplyRequest); PageInfo 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 purApplyEntities = purApplyService.queryPageList(purApplyRequest); PageInfo 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 1e8981371..01d1c3b9d 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 663cccb5d..c6e01ff31 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} ]]> - + and pur_apply.status = #{status} @@ -51,12 +51,14 @@ and (pur_apply.status = 1 or pur_apply.status = 2 or pur_apply.status = 4) - + + and (pur_apply.status = 3 or pur_apply.status = 4) + AND deptCode = #{deptCode} - AND invCode = #{invCode} + AND pur_apply.invCode = #{invCode} AND targetInvCode = #{targetInvCode} @@ -68,7 +70,7 @@ AND auditUser = #{auditUser} - AND createUser = #{createUser} + AND pur_apply.createUser = #{createUser} AND generatePlan = 1