From 86c46125e093061ae38d33c94e6891135d95d9b8 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 9 Sep 2024 17:19:16 +0800 Subject: [PATCH] =?UTF-8?q?9/9=20=E6=A0=B9=E6=8D=AE=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=B7=A5=E4=BD=8D=E6=9F=A5=E7=9C=8B=E5=8D=95?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/SysWorkplaceController.java | 2 +- .../collect/IoCollectOrderController.java | 23 +++++++++++++++++++ .../api/req/collect/CollectOrderRequest.java | 2 ++ .../mapper/collect/IoCollectOrderMapper.xml | 9 +++++++- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java index 1003e9f28..84a6024b0 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java @@ -155,7 +155,7 @@ public class SysWorkplaceController extends BaseController { return ResultVOUtils.error("当前工位已有员工绑定,请解绑之后在删除"); } WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest(); - workBindBusTypeRequest.setWorkplaceCode(String.valueOf(sysWorkplace.getWorkplaceId())); + workBindBusTypeRequest.setWorkplaceCode(sysWorkplace.getWorkplaceId()); List sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest); if (sysWorkplaceDocumentResponses.size() > 0) { return ResultVOUtils.error("当前工位已绑定单据,请解绑之后在删除"); diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 8f3555e5c..0a90cfe31 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -16,6 +16,7 @@ import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.IoCollectOrderCodeAuto; import com.glxp.api.entity.collect.IoCollectOrderCodeMan; +import com.glxp.api.req.basic.BasicCollectUserRequest; import com.glxp.api.req.basic.PrescribeBindWorkRequest; import com.glxp.api.req.collect.CollectOrderBindWorkRequest; import com.glxp.api.req.collect.CollectOrderBizRequest; @@ -23,8 +24,10 @@ import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.req.collect.CollectOrderSaveRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.UserWorkResponse; import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; +import com.glxp.api.service.basic.BasicCollectUserService; import com.glxp.api.service.basic.SysWorkplaceDocumentService; import com.glxp.api.service.collect.*; import com.glxp.api.util.IntUtil; @@ -41,6 +44,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; @RestController public class IoCollectOrderController extends BaseController { @@ -51,8 +55,27 @@ public class IoCollectOrderController extends BaseController { @Resource IoCollectOrderBizService collectOrderBizService; + @Resource + private BasicCollectUserService basicCollectUserService; @GetMapping("/udiwms/basic/collect/order/filter") public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) { + + List workPlaceCodes = null; + List page; + if (collectOrderRequest.getWorkPlaceCode() == null){ + Long userId = getUserId(); + BasicCollectUserRequest request = new BasicCollectUserRequest(); + request.setPage(1); + request.setLimit(100); + request.setUserId(userId.toString()); + page = basicCollectUserService.filterList(request); + if (page != null){ + workPlaceCodes = page.stream() + .map(UserWorkResponse::getWorkplaceId) + .collect(Collectors.toList()); + } + collectOrderRequest.setWorkPlaceCodes(workPlaceCodes); + } List orderResponses = collectOrderService.filterList(collectOrderRequest); PageInfo pageInfo = new PageInfo<>(orderResponses); PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java index ed1854132..297630090 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java @@ -63,6 +63,8 @@ public class CollectOrderRequest extends ListPageRequest { */ private Long workPlaceCode; + private List workPlaceCodes; + /** * 备注 */ diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index 59c66af77..97acd671e 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -24,7 +24,6 @@ ico.tagMsg, sys_workplace_document.busName busTypeName, bc.name fromCorpName, - sw.workplaceId workPlaceCode, sw.workplaceName, ico.id, ico.orderTime, @@ -84,6 +83,12 @@ #{item} + + and ico.workPlaceCode in + + #{item} + + and ico.invAlert =#{invAlert} @@ -97,6 +102,8 @@ and ico.uploadStatus = #{uploadStatus} + GROUP BY + ico.billNo order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc