审批后先同步报表再同步设备信息

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

@@ -866,6 +866,61 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
 
             BoilerTaskOrderDO boilerTaskOrderDO = boilerTaskOrderMapper.selectById(taskOrderItemTmp.getOrderId());
 
+            BoilerTaskOrderSyncReportVO reqVO = new BoilerTaskOrderSyncReportVO();
+            reqVO.setRefId(taskOrderItemTmp.getId());
+            boilerTaskOrderService.syncAllReportDataByOrderItemId(reqVO);
+
+            boolean isAllFinish = boilerTaskOrderItemDOList.stream().allMatch(item -> item.getTaskStatus() == TaskOrderStatusEnum.REPORT_FINISH.getStatus().intValue());
+            if (isAllFinish && !boilerTaskOrderItemDOList.isEmpty()) {
+                BoilerTaskOrderItemDO boilerTaskOrderItemDO = boilerTaskOrderItemDOList.get(0);
+                // 任务完成
+                BoilerTaskOrderDO updateOrder = new BoilerTaskOrderDO();
+                updateOrder.setId(boilerTaskOrderItemDO.getOrderId());
+                updateOrder.setTaskStatus(TaskOrderStatusEnum.REPORT_FINISH.getStatus());
+                updateOrder.setConfirmDate(now());
+                boilerTaskOrderMapper.updateById(updateOrder);
+
+                //任务单办结后添加任务单非税开单申请
+                try {
+                    taskOrderNonTaxApplyService.create(new TaskOrderNonTaxApplyCreateVO().setOrderId(boilerTaskOrderItemDO.getOrderId()));
+                } catch (Exception e) {
+                    log.error(e.getMessage());
+                }
+
+
+                CompletableFuture.runAsync(() -> {
+                    // 任务单办结
+                    boilerTaskOrderDO.setTaskStatus(TaskOrderStatusEnum.REPORT_FINISH.getStatus());
+                    pushTaskOrderService.pushFinanceSystem(boilerTaskOrderDO);
+                });
+
+                //生成任务单下所有设备报告
+                commonThread.runWithOutResult(() -> boilerTaskOrderIssueReportService.createIssueUrl(boilerTaskOrderDO.getId()));
+
+                //合同收费/属于免征则直接发送报告
+                if (Integer.valueOf(200).equals(boilerTaskOrderDO.getFeeType()) || Integer.valueOf(300).equals(boilerTaskOrderDO.getFeeNature())) {
+                    boilerTaskOrderIssueReportService.autoIssueTaskOrderReport(boilerTaskOrderDO, boilerTaskOrderItemDOList);
+                }
+
+            }
+
+            //当主报告完成审批后更新所有子报告的审批人员
+            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);
+
             //任务单办结后重置容器设备排期状态
             EquipBoilerDO equipBoilerDO = new EquipBoilerDO();
             equipBoilerDO.setId(taskOrderItemTmp.getEquipId());
@@ -877,8 +932,6 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
             if (100 == boilerTaskOrderDO.getCheckType()) {
                 equipBoilerDO.setHasInternal(false);
 
-
-//
                 if (map.getString("nextInCheckDate") != null) {
                     LocalDate nextInCheckDate = DateUtils.parseDateWithMultipleFormats(map.getString("nextInCheckDate"));
                     if (nextInCheckDate != null) {
@@ -977,62 +1030,7 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
                 historyDO.setIsFirst(false);
                 equipBoilerCheckHistoryMapper.insert(historyDO);
             }
-            BoilerTaskOrderSyncReportVO reqVO = new BoilerTaskOrderSyncReportVO();
-            reqVO.setRefId(taskOrderItemTmp.getId());
-            boilerTaskOrderService.syncAllReportDataByOrderItemId(reqVO);
-
-            boolean isAllFinish = boilerTaskOrderItemDOList.stream().allMatch(item -> item.getTaskStatus() == TaskOrderStatusEnum.REPORT_FINISH.getStatus().intValue());
-            if (isAllFinish && !boilerTaskOrderItemDOList.isEmpty()) {
-                BoilerTaskOrderItemDO boilerTaskOrderItemDO = boilerTaskOrderItemDOList.get(0);
-                // 任务完成
-                BoilerTaskOrderDO updateOrder = new BoilerTaskOrderDO();
-                updateOrder.setId(boilerTaskOrderItemDO.getOrderId());
-                updateOrder.setTaskStatus(TaskOrderStatusEnum.REPORT_FINISH.getStatus());
-                updateOrder.setConfirmDate(now());
-                boilerTaskOrderMapper.updateById(updateOrder);
-
-                //任务单办结后添加任务单非税开单申请
-                try {
-                    taskOrderNonTaxApplyService.create(new TaskOrderNonTaxApplyCreateVO().setOrderId(boilerTaskOrderItemDO.getOrderId()));
-                } catch (Exception e) {
-                    log.error(e.getMessage());
-                }
-
-
-                CompletableFuture.runAsync(() -> {
-                    // 任务单办结
-                    boilerTaskOrderDO.setTaskStatus(TaskOrderStatusEnum.REPORT_FINISH.getStatus());
-                    pushTaskOrderService.pushFinanceSystem(boilerTaskOrderDO);
-                });
-
-                //生成任务单下所有设备报告
-                commonThread.runWithOutResult(() -> boilerTaskOrderIssueReportService.createIssueUrl(boilerTaskOrderDO.getId()));
-
-                //合同收费/属于免征则直接发送报告
-                if (Integer.valueOf(200).equals(boilerTaskOrderDO.getFeeType()) || Integer.valueOf(300).equals(boilerTaskOrderDO.getFeeNature())) {
-                    boilerTaskOrderIssueReportService.autoIssueTaskOrderReport(boilerTaskOrderDO, boilerTaskOrderItemDOList);
-                }
-
-            }
 
-            //当主报告完成审批后更新所有子报告的审批人员
-            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

@@ -766,6 +766,71 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
 
             PipeTaskOrderDO pipeTaskOrderDO = pipeTaskOrderMapper.selectById(taskOrderItemReportDO.getOrderId());
 
+            PipeTaskOrderSyncReportVO reqVO = new PipeTaskOrderSyncReportVO();
+            reqVO.setOrderId(taskOrderItemReportDO.getOrderId());
+            pipeTaskOrderService.syncAllReportDataByOrderId(reqVO);
+
+            if (!pipeTaskOrderItemDOList.isEmpty()) {
+                PipeTaskOrderItemDO pipeTaskOrderItemDO = pipeTaskOrderItemDOList.get(0);
+                // 任务完成
+                PipeTaskOrderDO updateOrder = new PipeTaskOrderDO();
+                updateOrder.setId(pipeTaskOrderItemDO.getOrderId());
+                updateOrder.setTaskStatus(TaskOrderStatusEnum.REPORT_FINISH.getStatus());
+                updateOrder.setConfirmDate(now());
+                pipeTaskOrderMapper.updateById(updateOrder);
+
+                pipeTaskOrderInputMapper.update(new LambdaUpdateWrapper<PipeTaskOrderInputDO>()
+                        .eq(PipeTaskOrderInputDO::getOrderId, pipeTaskOrderItemDO.getOrderId())
+                        .set(PipeTaskOrderInputDO::getTaskStatus, TaskOrderStatusEnum.REPORT_FINISH.getStatus())
+                );
+
+                //任务单办结后添加任务单非税开单申请
+                try {
+                    taskOrderNonTaxApplyService.create(new TaskOrderNonTaxApplyCreateVO().setOrderId(pipeTaskOrderItemDO.getOrderId()));
+                } catch (Exception e) {
+                    log.error(e.getMessage());
+                }
+
+
+                CompletableFuture.runAsync(() -> {
+                    // 任务单办结
+                    pipeTaskOrderDO.setTaskStatus(TaskOrderStatusEnum.REPORT_FINISH.getStatus());
+                    pushTaskOrderService.pushFinanceSystem(pipeTaskOrderDO);
+                });
+
+                //生成任务单下所有设备报告
+                commonThread.runWithOutResult(() -> pipeTaskOrderIssueReportService.createIssueUrl(pipeTaskOrderDO.getId()));
+
+                //合同收费/属于免征则直接发送报告
+                if (Integer.valueOf(200).equals(pipeTaskOrderDO.getFeeType()) || Integer.valueOf(300).equals(pipeTaskOrderDO.getFeeNature())) {
+                    pipeTaskOrderIssueReportService.autoIssueTaskOrderReport(pipeTaskOrderDO, pipeTaskOrderItemDOList);
+                }
+
+            }
+
+            //当主报告完成审批后更新所有子报告的审批人员
+            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())) {
+                pipeUseRegistrationReportService.generatePipeUseRegistrationReport(pipeTaskOrderDO.getId());
+            }
+
+            //修改设备信息
             //任务单办结后重置容器设备排期状态
             String prepareJson = taskOrderItemReportDO.getPrepareJson();
             JSONObject map = JSONObject.parse(prepareJson);
@@ -870,72 +935,6 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
                 }
             }
 
-            PipeTaskOrderSyncReportVO reqVO = new PipeTaskOrderSyncReportVO();
-            reqVO.setOrderId(taskOrderItemReportDO.getOrderId());
-            pipeTaskOrderService.syncAllReportDataByOrderId(reqVO);
-
-            if (!pipeTaskOrderItemDOList.isEmpty()) {
-                PipeTaskOrderItemDO pipeTaskOrderItemDO = pipeTaskOrderItemDOList.get(0);
-                // 任务完成
-                PipeTaskOrderDO updateOrder = new PipeTaskOrderDO();
-                updateOrder.setId(pipeTaskOrderItemDO.getOrderId());
-                updateOrder.setTaskStatus(TaskOrderStatusEnum.REPORT_FINISH.getStatus());
-                updateOrder.setConfirmDate(now());
-                pipeTaskOrderMapper.updateById(updateOrder);
-
-                pipeTaskOrderInputMapper.update(new LambdaUpdateWrapper<PipeTaskOrderInputDO>()
-                        .eq(PipeTaskOrderInputDO::getOrderId, pipeTaskOrderItemDO.getOrderId())
-                        .set(PipeTaskOrderInputDO::getTaskStatus, TaskOrderStatusEnum.REPORT_FINISH.getStatus())
-                );
-
-                //任务单办结后添加任务单非税开单申请
-                try {
-                    taskOrderNonTaxApplyService.create(new TaskOrderNonTaxApplyCreateVO().setOrderId(pipeTaskOrderItemDO.getOrderId()));
-                } catch (Exception e) {
-                    log.error(e.getMessage());
-                }
-
-
-                CompletableFuture.runAsync(() -> {
-                    // 任务单办结
-                    pipeTaskOrderDO.setTaskStatus(TaskOrderStatusEnum.REPORT_FINISH.getStatus());
-                    pushTaskOrderService.pushFinanceSystem(pipeTaskOrderDO);
-                });
-
-                //生成任务单下所有设备报告
-                commonThread.runWithOutResult(() -> pipeTaskOrderIssueReportService.createIssueUrl(pipeTaskOrderDO.getId()));
-
-                //合同收费/属于免征则直接发送报告
-                if (Integer.valueOf(200).equals(pipeTaskOrderDO.getFeeType()) || Integer.valueOf(300).equals(pipeTaskOrderDO.getFeeNature())) {
-                    pipeTaskOrderIssueReportService.autoIssueTaskOrderReport(pipeTaskOrderDO, pipeTaskOrderItemDOList);
-                }
-
-            }
-
-            //当主报告完成审批后更新所有子报告的审批人员
-            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())) {
-                pipeUseRegistrationReportService.generatePipeUseRegistrationReport(pipeTaskOrderDO.getId());
-            }
-
         }
 
     }