From c2a369c1a97e0a04260c40b3d2f85acc3550fbad Mon Sep 17 00:00:00 2001 From: yewj Date: Fri, 13 Sep 2024 09:10:05 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/auth/DeptController.java | 8 ++++---- .../auth/SysWorkplaceController.java | 20 +++++++++---------- .../mapper/basic/SysWorkplaceDocumentDao.xml | 11 ++++------ 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java index 2b8de05dc..ae73c8fc8 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -75,8 +75,8 @@ public class DeptController { filterInvWarehouseRequest.setPid(0L); filterInvWarehouseRequest.setStatus(1); List invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest); - List reList = invWarehouseEntities.stream().map(s-> { - DictDto dictDto = new DictDto(s.getCode(),s.getName()); + List reList = invWarehouseEntities.stream().map(s -> { + DictDto dictDto = new DictDto(s.getCode(), s.getName()); return dictDto; }).collect(Collectors.toList()); return ResultVOUtils.success(reList); @@ -114,8 +114,8 @@ public class DeptController { filterInvWarehouseRequest.setStatus(1); filterInvWarehouseRequest.setUserId(authAdmin.getId()); List mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); - List reList = mInvWarehouseEntities.stream().map(s-> { - DictDto dictDto = new DictDto(s.getCode(),s.getName()); + List reList = mInvWarehouseEntities.stream().map(s -> { + DictDto dictDto = new DictDto(s.getCode(), s.getName()); return dictDto; }).collect(Collectors.toList()); return ResultVOUtils.success(reList); 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 84a6024b0..f5da040d9 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java @@ -106,11 +106,11 @@ public class SysWorkplaceController extends BaseController { @AuthRuleAnnotation("") @GetMapping("/udiwms/sysWorkplace/page/filterOptimize") public BaseResponse filterOptimize(SysWorkplaceRequest request) { - if(request != null && request.getUserIdFlag()){ + if (request != null && request.getUserIdFlag()) { Long userId = getUserId(); List userWorkPlaceList = basicCollectUserService.getUserWorkPlaceList(userId); List collect = userWorkPlaceList.stream().map(UserWorkResponse::getWorkplaceId).collect(Collectors.toList()); - if (CollUtil.isNotEmpty(collect)){ + if (CollUtil.isNotEmpty(collect)) { request.setWorkPlaceIds(collect); } } @@ -156,10 +156,10 @@ public class SysWorkplaceController extends BaseController { } WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest(); workBindBusTypeRequest.setWorkplaceCode(sysWorkplace.getWorkplaceId()); - List sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest); - if (sysWorkplaceDocumentResponses.size() > 0) { - return ResultVOUtils.error("当前工位已绑定单据,请解绑之后在删除"); - } +// List sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest); +// if (sysWorkplaceDocumentResponses.size() > 0) { +// return ResultVOUtils.error("当前工位已绑定单据类型,请解绑之后在删除"); +// } boolean save = sysWorkplaceService.removeById(sysWorkplace); if (!save) { return ResultVOUtils.error("删除错误"); @@ -274,20 +274,18 @@ public class SysWorkplaceController extends BaseController { } - - @PostMapping("/udiwms/sysWorkplace/switchWorkplaceStatus") public BaseResponse switchWorkplaceStatus(@RequestBody SysWorkplace entity) { Long workplaceId = entity.getWorkplaceId(); Integer workplaceStatus = entity.getWorkplaceStatus(); - if (workplaceId == null || workplaceStatus == null){ + if (workplaceId == null || workplaceStatus == null) { return ResultVOUtils.error(ResultEnum.DATA_NOT, "参数错误!"); } UpdateWrapper sysWorkplaceUpdateWrapper = new UpdateWrapper<>(); - sysWorkplaceUpdateWrapper.set("workplaceStatus",workplaceStatus); - sysWorkplaceUpdateWrapper.eq("workplaceId",workplaceId); + sysWorkplaceUpdateWrapper.set("workplaceStatus", workplaceStatus); + sysWorkplaceUpdateWrapper.eq("workplaceId", workplaceId); boolean save = sysWorkplaceService.update(sysWorkplaceUpdateWrapper); if (!save) { return ResultVOUtils.error("更新失败"); diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml index 980b3cd47..cecdb937a 100644 --- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml +++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml @@ -12,9 +12,6 @@ left join thr_bustype_origin on thr_bustype_origin.action = sys_workplace_document.documentTypeCode - - AND workplaceCode = #{workplaceCode} - AND documentTypeCode = #{documentTypeCode} @@ -30,12 +27,13 @@ ORDER BY sys_workplace_document.number - select sys_workplace_document.*,sys_workplace_bus.workplaceCode, basic_bussiness_type.name innerBusName, thr_bustype_origin.name outBusName - from sys_workplace_bus - LEFT JOIN sys_workplace_document ON sys_workplace_document.documentTypeCode = sys_workplace_bus.busTypeCode + from sys_workplace_bus + LEFT JOIN sys_workplace_document + ON sys_workplace_document.documentTypeCode = sys_workplace_bus.busTypeCode left join basic_bussiness_type on sys_workplace_document.documentTypeCode = basic_bussiness_type.action left join thr_bustype_origin on thr_bustype_origin.action = sys_workplace_document.documentTypeCode @@ -59,6 +57,5 @@