bug修改

src/main/java/com/glxp/api/controller/auth/DeptController.java

@@ -75,8 +75,8 @@ public class DeptController {
         filterInvWarehouseRequest.setPid(0L);
         filterInvWarehouseRequest.setStatus(1);
         List<DeptEntity> invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest);
-        List<DictDto> reList = invWarehouseEntities.stream().map(s-> {
+        List<DictDto> reList = invWarehouseEntities.stream().map(s -> {
-            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            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<DeptEntity> mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
-        List<DictDto> reList = mInvWarehouseEntities.stream().map(s-> {
+        List<DictDto> reList = mInvWarehouseEntities.stream().map(s -> {
-            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            DictDto dictDto = new DictDto(s.getCode(), s.getName());
             return dictDto;
         }).collect(Collectors.toList());
         return ResultVOUtils.success(reList);

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<UserWorkResponse> userWorkPlaceList = basicCollectUserService.getUserWorkPlaceList(userId);
             List<Long> 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<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest);
+//        List<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest);
-        if (sysWorkplaceDocumentResponses.size() > 0) {
+//        if (sysWorkplaceDocumentResponses.size() > 0) {
-            return ResultVOUtils.error("当前工位已绑定单据,请解绑之后在删除");
+//            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<SysWorkplace> sysWorkplaceUpdateWrapper = new UpdateWrapper<>();
-        sysWorkplaceUpdateWrapper.set("workplaceStatus",workplaceStatus);
+        sysWorkplaceUpdateWrapper.set("workplaceStatus", workplaceStatus);
-        sysWorkplaceUpdateWrapper.eq("workplaceId",workplaceId);
+        sysWorkplaceUpdateWrapper.eq("workplaceId", workplaceId);
         boolean save = sysWorkplaceService.update(sysWorkplaceUpdateWrapper);
         if (!save) {
             return ResultVOUtils.error("更新失败");

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
 
         <where>
-            <if test="workplaceCode != '' and workplaceCode != null">
-                AND workplaceCode = #{workplaceCode}
-            </if>
             <if test="documentTypeCode != '' and documentTypeCode != null">
                 AND documentTypeCode = #{documentTypeCode}
             </if>
@@ -30,12 +27,13 @@
         ORDER BY sys_workplace_document.number
     </select>
 
-        <select id="filterListByWorkplace" resultType="com.glxp.api.res.basic.SysWorkplaceDocumentResponse">
+    <select id="filterListByWorkplace" resultType="com.glxp.api.res.basic.SysWorkplaceDocumentResponse">
         select sys_workplace_document.*,sys_workplace_bus.workplaceCode,
                basic_bussiness_type.name innerBusName,
                thr_bustype_origin.name   outBusName
-               from sys_workplace_bus
+        from sys_workplace_bus
-	             LEFT JOIN sys_workplace_document ON sys_workplace_document.documentTypeCode = sys_workplace_bus.busTypeCode
+                 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 @@
     <select id="findMaxNumberByWorkplaceCode" resultType="java.lang.Integer">
         SELECT MAX(number) AS maxNumber
         FROM sys_workplace_document
-        WHERE workplaceCode = #{workplaceCode}
     </select>
 </mapper>