tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskordersignfile/BoilerTaskOrderSignFileMapper.java

@@ -60,4 +60,12 @@ public interface BoilerTaskOrderSignFileMapper extends BaseMapperX<BoilerTaskOrd
         return selectJoinPage(reqVO, BoilerTaskOrderSignFileRespVO.class, recordDOMPJLambdaWrapper);
     }
 
+    default List<BoilerTaskOrderSignFileDO> selectListByOrderIdCollection(Collection<String> orderIds) {
+        if (orderIds == null || orderIds.isEmpty()) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapperX<BoilerTaskOrderSignFileDO> lwqx = new LambdaQueryWrapperX<>();
+        lwqx.in(BoilerTaskOrderSignFileDO::getOrderId, orderIds);
+        return selectList(lwqx);
+    }
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -717,23 +717,10 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
         Map<String, BoilerTaskOrderRespVO> taskOrderIdToEntityMap = boilerTaskOrderRespVOS.stream()
                 .collect(Collectors.toMap(BoilerTaskOrderRespVO::getId, Function.identity()));
-        List<NotificationformReportDO> notificationformReportDOS = notificationformReportMapper.selectListByOrderIdSet(taskOrderIdToEntityMap.keySet());
-        for (NotificationformReportDO notificationformReportDO : notificationformReportDOS) {
-            String taskOrderId = notificationformReportDO.getTaskOrderId();
-            BoilerTaskOrderRespVO boilerTaskOrderRespVO = taskOrderIdToEntityMap.get(taskOrderId);
-            List<BoilerTaskOrderSignFileDO> signFileList = boilerTaskOrderRespVO.getSignFileList();
-            if (signFileList == null) {
-                ArrayList<BoilerTaskOrderSignFileDO> initList = new ArrayList<>();
-                boilerTaskOrderRespVO.setSignFileList(initList);
-                signFileList = initList;
-            }
-            BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = buildSignFileObjByNotificationFormReportDO(notificationformReportDO);
-            signFileList.add(boilerTaskOrderSignFileDO);
-        }
 
-        List<OrderReportDO> orderReportDOList = orderReportService.getListByOrderIdSet(taskOrderIdToEntityMap.keySet());
-        for (OrderReportDO orderReportDO : orderReportDOList) {
-            String taskOrderId = orderReportDO.getTaskOrderId();
+        List<BoilerTaskOrderSignFileDO> boilerTaskOrderSignFileDOS = taskOrderSignFileMapper.selectListByOrderIdCollection(taskOrderIdToEntityMap.keySet());
+        for (BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO : boilerTaskOrderSignFileDOS) {
+            String taskOrderId = boilerTaskOrderSignFileDO.getOrderId();
             BoilerTaskOrderRespVO boilerTaskOrderRespVO = taskOrderIdToEntityMap.get(taskOrderId);
             List<BoilerTaskOrderSignFileDO> signFileList = boilerTaskOrderRespVO.getSignFileList();
             if (signFileList == null) {
@@ -741,48 +728,14 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
                 boilerTaskOrderRespVO.setSignFileList(initList);
                 signFileList = initList;
             }
-            BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = buildSignFileObjByOrderReportDO(orderReportDO);
             signFileList.add(boilerTaskOrderSignFileDO);
         }
 
-
         pageResult.setList(boilerTaskOrderRespVOS);
         pageResult.setTotal(boilerTaskOrderMapper.selectPageCount(pageReqVO));
         return pageResult;
     }
 
-    private BoilerTaskOrderSignFileDO buildSignFileObjByNotificationFormReportDO(NotificationformReportDO notificationformReportDO) {
-        BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = new BoilerTaskOrderSignFileDO();
-        boilerTaskOrderSignFileDO.setOrderId(notificationformReportDO.getTaskOrderId());
-        boilerTaskOrderSignFileDO.setBusinessType(200);
-        String notificationformReportDOSignUrl = notificationformReportDO.getSignUrl();
-        if (notificationformReportDOSignUrl != null && !notificationformReportDOSignUrl.isEmpty()) {
-            boilerTaskOrderSignFileDO.setSignUrl(notificationformReportDOSignUrl);
-            boilerTaskOrderSignFileDO.setIsSignature("1");
-            boilerTaskOrderSignFileDO.setSignDate(notificationformReportDO.getSignDate());
-        } else {
-            boilerTaskOrderSignFileDO.setIsSignature("0");
-        }
-        return boilerTaskOrderSignFileDO;
-    }
-
-    private BoilerTaskOrderSignFileDO buildSignFileObjByOrderReportDO(OrderReportDO orderReportDO) {
-        BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = new BoilerTaskOrderSignFileDO();
-        boilerTaskOrderSignFileDO.setOrderId(orderReportDO.getTaskOrderId());
-        boilerTaskOrderSignFileDO.setBusinessType(100);
-        String orderReportDOSignUrl = orderReportDO.getSignUrl();
-        if (orderReportDOSignUrl != null && !orderReportDOSignUrl.isEmpty()) {
-            boilerTaskOrderSignFileDO.setSignUrl(orderReportDOSignUrl);
-            boilerTaskOrderSignFileDO.setIsSignature("1");
-            boilerTaskOrderSignFileDO.setSignDate(orderReportDO.getSignDate());
-        } else {
-            boilerTaskOrderSignFileDO.setIsSignature("0");
-        }
-        return boilerTaskOrderSignFileDO;
-    }
-
-
-
     @Override
     @Transactional
     public void confirm(BoilerTaskOrderConfirmVO taskOrderConfirmVO) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -48,6 +48,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.opinionnotificationfollowreco
 import cn.start.tz.module.pressure2.dal.dataobject.orderreport.OrderReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderinput.PipeTaskOrderInputDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilerconnectrecordreport.BoilerConnectRecordReportMapper;
+import cn.start.tz.module.pressure2.dal.mysql.boilertaskordersignfile.BoilerTaskOrderSignFileMapper;
 import cn.start.tz.module.pressure2.dal.mysql.businessmemberrelation.BusinessMemberRelationMapper;
 import cn.start.tz.module.pressure2.dal.mysql.notificationformreport.NotificationformReportMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipeacceptorderuser.PipeAcceptOrderUserMapper;
@@ -403,6 +404,9 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
     @Resource
     private DeptApi deptApi;
 
+    @Resource
+    private BoilerTaskOrderSignFileMapper taskOrderSignFileMapper;
+
     private void validateBoilerTaskOrderExists(String id) {
         if (pipeTaskOrderMapper.selectById(id) == null) {
             throw exception(BOILER_TASK_ORDER_NOT_EXISTS);
@@ -634,9 +638,9 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         Map<String, PipeTaskOrderRespVO> taskOrderIdToEntityMap = TaskOrderRespVOS.stream()
                 .collect(Collectors.toMap(PipeTaskOrderRespVO::getId, Function.identity()));
-        List<NotificationformReportDO> notificationformReportDOS = notificationformReportMapper.selectListByOrderIdSet(taskOrderIdToEntityMap.keySet());
-        for (NotificationformReportDO notificationformReportDO : notificationformReportDOS) {
-            String taskOrderId = notificationformReportDO.getTaskOrderId();
+        List<BoilerTaskOrderSignFileDO> boilerTaskOrderSignFileDOS = taskOrderSignFileMapper.selectListByOrderIdCollection(taskOrderIdToEntityMap.keySet());
+        for (BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO : boilerTaskOrderSignFileDOS) {
+            String taskOrderId = boilerTaskOrderSignFileDO.getOrderId();
             PipeTaskOrderRespVO pipeTaskOrderRespVO = taskOrderIdToEntityMap.get(taskOrderId);
             List<BoilerTaskOrderSignFileDO> signFileList = pipeTaskOrderRespVO.getSignFileList();
             if (signFileList == null) {
@@ -644,60 +648,14 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                 pipeTaskOrderRespVO.setSignFileList(initList);
                 signFileList = initList;
             }
-            BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = buildSignFileObjByNotificationFormReportDO(notificationformReportDO);
             signFileList.add(boilerTaskOrderSignFileDO);
         }
 
-        List<OrderReportDO> orderReportDOList = orderReportService.getListByOrderIdSet(taskOrderIdToEntityMap.keySet());
-        for (OrderReportDO orderReportDO : orderReportDOList) {
-            String taskOrderId = orderReportDO.getTaskOrderId();
-            PipeTaskOrderRespVO pipeTaskOrderRespVO = taskOrderIdToEntityMap.get(taskOrderId);
-            List<BoilerTaskOrderSignFileDO> signFileList = pipeTaskOrderRespVO.getSignFileList();
-            if (signFileList == null) {
-                ArrayList<BoilerTaskOrderSignFileDO> initList = new ArrayList<>();
-                pipeTaskOrderRespVO.setSignFileList(initList);
-                signFileList = initList;
-            }
-            BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = buildSignFileObjByOrderReportDO(orderReportDO);
-            signFileList.add(boilerTaskOrderSignFileDO);
-        }
-
-
         pageResult.setList(TaskOrderRespVOS);
         pageResult.setTotal(pipeTaskOrderMapper.selectPageCount(pageReqVO));
         return pageResult;
     }
 
-    private BoilerTaskOrderSignFileDO buildSignFileObjByNotificationFormReportDO(NotificationformReportDO notificationformReportDO) {
-        BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = new BoilerTaskOrderSignFileDO();
-        boilerTaskOrderSignFileDO.setOrderId(notificationformReportDO.getTaskOrderId());
-        boilerTaskOrderSignFileDO.setBusinessType(200);
-        String notificationformReportDOSignUrl = notificationformReportDO.getSignUrl();
-        if (notificationformReportDOSignUrl != null && !notificationformReportDOSignUrl.isEmpty()) {
-            boilerTaskOrderSignFileDO.setSignUrl(notificationformReportDOSignUrl);
-            boilerTaskOrderSignFileDO.setIsSignature("1");
-            boilerTaskOrderSignFileDO.setSignDate(notificationformReportDO.getSignDate());
-        } else {
-            boilerTaskOrderSignFileDO.setIsSignature("0");
-        }
-        return boilerTaskOrderSignFileDO;
-    }
-
-    private BoilerTaskOrderSignFileDO buildSignFileObjByOrderReportDO(OrderReportDO orderReportDO) {
-        BoilerTaskOrderSignFileDO boilerTaskOrderSignFileDO = new BoilerTaskOrderSignFileDO();
-        boilerTaskOrderSignFileDO.setOrderId(orderReportDO.getTaskOrderId());
-        boilerTaskOrderSignFileDO.setBusinessType(100);
-        String orderReportDOSignUrl = orderReportDO.getSignUrl();
-        if (orderReportDOSignUrl != null && !orderReportDOSignUrl.isEmpty()) {
-            boilerTaskOrderSignFileDO.setSignUrl(orderReportDOSignUrl);
-            boilerTaskOrderSignFileDO.setIsSignature("1");
-            boilerTaskOrderSignFileDO.setSignDate(orderReportDO.getSignDate());
-        } else {
-            boilerTaskOrderSignFileDO.setIsSignature("0");
-        }
-        return boilerTaskOrderSignFileDO;
-    }
-
     @Override
     @Transactional
     public void confirm(BoilerTaskOrderConfirmVO taskOrderConfirmVO) {