审核签名

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemreport/BoilerTaskOrderItemReportServiceImpl.java

@@ -784,16 +784,16 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
     @Resource
     private BoilerTaskOrderItemReportRecordMapper boilerTaskOrderItemReportRecordMapper;
 
-    /**
-     * 报告审批通过
-     *
-     * @param id 报告id
-     */
-    public void updateOrderItemRatifyFinish(String id) {
-        String userId = getLoginUserId();
-        AdminUserRespDTO userRespDTO = adminUserApi.getUser(userId).getData();
-        updateOrderItemRatifyFinish(id, userId, userRespDTO != null ? userRespDTO.getNickname() : null, LocalDateTime.now(), null, null, null);
-    }
+//    /**
+//     * 报告审批通过
+//     *
+//     * @param id 报告id
+//     */
+//    public void updateOrderItemRatifyFinish(String id) {
+//        String userId = getLoginUserId();
+//        AdminUserRespDTO userRespDTO = adminUserApi.getUser(userId).getData();
+//        updateOrderItemRatifyFinish(id, userId, userRespDTO != null ? userRespDTO.getNickname() : null, LocalDateTime.now(), null, null, null);
+//    }
 
     /**
      * 办结报告（轮询调用，从OA评论中获取审核人员和审批人员）
@@ -1016,19 +1016,23 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
             }
 
             //当主报告完成审批后更新所有子报告的审批人员
-            LambdaUpdateWrapper<BoilerTaskOrderItemReportDO> updateBySubReport = new LambdaUpdateWrapper<>();
-            updateBySubReport.eq(BoilerTaskOrderItemReportDO::getOrderItemId, taskOrderItemReportDO.getOrderItemId());
-            updateBySubReport.eq(BoilerTaskOrderItemReportDO::getReportType, TaskOrderItemReportTypeEnum.SUB_REPORT.getType());
-            updateBySubReport.set(BoilerTaskOrderItemReportDO::getApprovalId, approvalId);
-            updateBySubReport.set(BoilerTaskOrderItemReportDO::getApprovalName, updateObj.getApprovalName());
-            updateBySubReport.set(BoilerTaskOrderItemReportDO::getApprovalTime, updateObj.getApprovalTime());
-            updateBySubReport.set(BoilerTaskOrderItemReportDO::getRatifyId, ratifyId);
-            updateBySubReport.set(BoilerTaskOrderItemReportDO::getRatifyName, updateObj.getRatifyName());
-            updateBySubReport.set(BoilerTaskOrderItemReportDO::getRatifyTime, updateObj.getRatifyTime());
-            taskOrderItemReportMapper.update(updateBySubReport);
-            BoilerTaskOrderSyncReportVO syncReportVO = new BoilerTaskOrderSyncReportVO();
-            syncReportVO.setOrderItemId(taskOrderItemReportDO.getOrderItemId());
-            boilerTaskOrderService.syncAllReportDataByOrderItemId(syncReportVO);
+            CompletableFuture.runAsync(() -> {
+                String taskOrderItemReportDOId = taskOrderItemReportDO.getId();
+                BoilerTaskOrderItemReportDO boilerTaskOrderItemReportDO = boilerTaskOrderItemReportMapper.selectById(taskOrderItemReportDOId);
+                LambdaUpdateWrapper<BoilerTaskOrderItemReportDO> updateBySubReport = new LambdaUpdateWrapper<>();
+                updateBySubReport.eq(BoilerTaskOrderItemReportDO::getOrderItemId,boilerTaskOrderItemReportDO.getOrderItemId());
+                updateBySubReport.eq(BoilerTaskOrderItemReportDO::getReportType, TaskOrderItemReportTypeEnum.SUB_REPORT.getType());
+                updateBySubReport.set(BoilerTaskOrderItemReportDO::getApprovalId, boilerTaskOrderItemReportDO.getApprovalId());
+                updateBySubReport.set(BoilerTaskOrderItemReportDO::getApprovalName, boilerTaskOrderItemReportDO.getApprovalName());
+                updateBySubReport.set(BoilerTaskOrderItemReportDO::getApprovalTime, boilerTaskOrderItemReportDO.getApprovalTime());
+                updateBySubReport.set(BoilerTaskOrderItemReportDO::getRatifyId, boilerTaskOrderItemReportDO.getRatifyId());
+                updateBySubReport.set(BoilerTaskOrderItemReportDO::getRatifyName, boilerTaskOrderItemReportDO.getRatifyName());
+                updateBySubReport.set(BoilerTaskOrderItemReportDO::getRatifyTime, boilerTaskOrderItemReportDO.getRatifyTime());
+                taskOrderItemReportMapper.update(updateBySubReport);
+                BoilerTaskOrderSyncReportVO syncReportVO = new BoilerTaskOrderSyncReportVO();
+                syncReportVO.setOrderItemId(boilerTaskOrderItemReportDO.getOrderItemId());
+                boilerTaskOrderService.syncAllReportDataByOrderItemId(syncReportVO);
+            });
         }
 
     }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeTaskOrderItemReportServiceImpl.java

@@ -913,19 +913,23 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
             }
 
             //当主报告完成审批后更新所有子报告的审批人员
-            LambdaUpdateWrapper<PipeTaskOrderItemReportDO> updateBySubReport = new LambdaUpdateWrapper<>();
-            updateBySubReport.eq(PipeTaskOrderItemReportDO::getOrderId, taskOrderItemReportDO.getOrderId());
-            updateBySubReport.eq(PipeTaskOrderItemReportDO::getReportType, TaskOrderItemReportTypeEnum.SUB_REPORT.getType());
-            updateBySubReport.set(PipeTaskOrderItemReportDO::getApprovalId, approvalId);
-            updateBySubReport.set(PipeTaskOrderItemReportDO::getApprovalName, updateObj.getApprovalName());
-            updateBySubReport.set(PipeTaskOrderItemReportDO::getApprovalTime, updateObj.getApprovalTime());
-            updateBySubReport.set(PipeTaskOrderItemReportDO::getRatifyId, ratifyId);
-            updateBySubReport.set(PipeTaskOrderItemReportDO::getRatifyName, updateObj.getRatifyName());
-            updateBySubReport.set(PipeTaskOrderItemReportDO::getRatifyTime, updateObj.getRatifyTime());
-            taskOrderItemReportMapper.update(updateBySubReport);
-            PipeTaskOrderSyncReportVO syncReportVO = new PipeTaskOrderSyncReportVO();
-            syncReportVO.setOrderId(taskOrderItemReportDO.getOrderId());
-            pipeTaskOrderService.syncAllReportDataByOrderId(syncReportVO);
+            CompletableFuture.runAsync(() -> {
+                LambdaUpdateWrapper<PipeTaskOrderItemReportDO> updateBySubReport = new LambdaUpdateWrapper<>();
+                String taskOrderItemReportDOId = taskOrderItemReportDO.getId();
+                PipeTaskOrderItemReportDO pipeTaskOrderItemReportDO = pipeTaskOrderItemReportMapper.selectById(taskOrderItemReportDOId);
+                updateBySubReport.eq(PipeTaskOrderItemReportDO::getOrderId, pipeTaskOrderItemReportDO.getOrderId());
+                updateBySubReport.eq(PipeTaskOrderItemReportDO::getReportType, TaskOrderItemReportTypeEnum.SUB_REPORT.getType());
+                updateBySubReport.set(PipeTaskOrderItemReportDO::getApprovalId, pipeTaskOrderItemReportDO.getApprovalId());
+                updateBySubReport.set(PipeTaskOrderItemReportDO::getApprovalName, pipeTaskOrderItemReportDO.getApprovalName());
+                updateBySubReport.set(PipeTaskOrderItemReportDO::getApprovalTime, pipeTaskOrderItemReportDO.getApprovalTime());
+                updateBySubReport.set(PipeTaskOrderItemReportDO::getRatifyId, pipeTaskOrderItemReportDO.getRatifyId());
+                updateBySubReport.set(PipeTaskOrderItemReportDO::getRatifyName, pipeTaskOrderItemReportDO.getRatifyName());
+                updateBySubReport.set(PipeTaskOrderItemReportDO::getRatifyTime, pipeTaskOrderItemReportDO.getRatifyTime());
+                taskOrderItemReportMapper.update(updateBySubReport);
+                PipeTaskOrderSyncReportVO syncReportVO = new PipeTaskOrderSyncReportVO();
+                syncReportVO.setOrderId(taskOrderItemReportDO.getOrderId());
+                pipeTaskOrderService.syncAllReportDataByOrderId(syncReportVO);
+            });
 
             //定检需要生成使用登记表
             if (EquipmentCheckTypeEnum.PERIODICAL_SURVEY.getType().equals(pipeTaskOrderDO.getCheckType())) {