受理单审核调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/acceptorder/AcceptOrderServiceImpl.java

@@ -935,6 +935,9 @@ public class AcceptOrderServiceImpl implements AcceptOrderService {
             }
         }
 
+        //设置查询设备类型
+        pageReqVO.setEquipMainType(200);
+
         PageResult<AcceptOrderDO> acceptOrderDOPageResult = acceptOrderMapper.selectPage(pageReqVO);
         PageResult<AcceptOrderRespVO> pageResult = BeanUtils.toBean(acceptOrderDOPageResult, AcceptOrderRespVO.class);
 
@@ -952,7 +955,7 @@ public class AcceptOrderServiceImpl implements AcceptOrderService {
 
         //user List
         Map<String, List<BoilerAcceptOrderUserDO>> userList = acceptOrderUserDOS.stream().collect(Collectors.groupingBy(BoilerAcceptOrderUserDO::getOrderId));
-        Map<String, List<PipeAcceptOrderUserDO>> userList1 = acceptOrderUserDOS1.stream().collect(Collectors.groupingBy(PipeAcceptOrderUserDO::getOrderId));
+//        Map<String, List<PipeAcceptOrderUserDO>> userList1 = acceptOrderUserDOS1.stream().collect(Collectors.groupingBy(PipeAcceptOrderUserDO::getOrderId));
         Map<String, BpmTaskDTO> bpmTaskDTOMap = bpmTaskApi.getLastTaskMap(processInstanceIds).getData();
 
         pageResult.getList().forEach(acceptOrder -> {
@@ -969,10 +972,10 @@ public class AcceptOrderServiceImpl implements AcceptOrderService {
             if (boilerUsers != null) {
                 checkerUserIds.addAll(boilerUsers);
             }
-            List<PipeAcceptOrderUserDO> pipeAcceptOrderUserDOS = userList1.get(acceptOrder.getId());
-            if (pipeAcceptOrderUserDOS != null) {
-                checkerUserIds.addAll(BeanUtils.toBean(pipeAcceptOrderUserDOS, BoilerAcceptOrderUserDO.class));
-            }
+//            List<PipeAcceptOrderUserDO> pipeAcceptOrderUserDOS = userList1.get(acceptOrder.getId());
+//            if (pipeAcceptOrderUserDOS != null) {
+//                checkerUserIds.addAll(BeanUtils.toBean(pipeAcceptOrderUserDOS, BoilerAcceptOrderUserDO.class));
+//            }
             acceptOrder.setCheckerUserIds(checkerUserIds);
 
         });

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/acceptorder/PipeAcceptOrderServiceImpl.java

@@ -941,6 +941,9 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
             }
         }
 
+        //设置查询设备类型
+        pageReqVO.setEquipMainType(300);
+
         PageResult<AcceptOrderDO> acceptOrderDOPageResult = acceptOrderMapper.selectPage(pageReqVO);
         PageResult<AcceptOrderRespVO> pageResult = BeanUtils.toBean(acceptOrderDOPageResult, AcceptOrderRespVO.class);
 
@@ -968,7 +971,12 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
             }
 
             acceptOrder.setDept(deptMap.get(acceptOrder.getDeptId()));
-//            acceptOrder.setCheckerUserIds(userList.get(acceptOrder.getId()));
+            List<PipeAcceptOrderUserDO> checkerUserIds = new ArrayList<>();
+            List<PipeAcceptOrderUserDO> pipeUsers = userList.get(acceptOrder.getId());
+            if (pipeUsers != null) {
+                checkerUserIds.addAll(pipeUsers);
+            }
+            acceptOrder.setCheckerUserIds(BeanUtils.toBean(checkerUserIds, BoilerAcceptOrderUserDO.class));
         });
 
         List<String> userIds = pageResult.getList().stream().map(AcceptOrderRespVO::getCurrentAuditorId).filter(Objects::nonNull).collect(Collectors.toList());
@@ -988,7 +996,10 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
 
                 if(acceptOrder.getCheckerUserIds() != null){
                     acceptOrder.getCheckerUserIds().forEach(checkerUserId -> {
-                        acceptOrder.getCheckers().add(userMap.get(checkerUserId.getUserId()));
+                        AdminUserRespDTO e = userMap.get(checkerUserId.getUserId());
+                        if (e != null){
+                            acceptOrder.getCheckers().add(e);
+                        }
                     });
                 }