取消独审带出

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/orderreport/OrderReportServiceImpl.java

@@ -214,6 +214,13 @@ public class OrderReportServiceImpl extends ServiceImpl<OrderReportMapper, Order
 
     @Override
     public void generateBoilerOrderReport(String acceptOrderId) {
+        if (acceptOrderMapper.selectById(acceptOrderId) == null) {
+            PipeTaskOrderDO pipeTaskOrderDO = pipeTaskOrderMapper.selectById(acceptOrderId);
+            if (pipeTaskOrderDO == null) {
+                throw new ServiceException(500, "受理单不存在");
+            }
+            acceptOrderId = pipeTaskOrderDO.getAcceptOrderId();
+        }
         List<EquipBoilerSchedulingCheckDO> list = equipBoilerSchedulingCheckService.list(
                 new LambdaQueryWrapper<EquipBoilerSchedulingCheckDO>()
                         .eq(EquipBoilerSchedulingCheckDO::getAcceptOrderId, acceptOrderId)
@@ -323,6 +330,13 @@ public class OrderReportServiceImpl extends ServiceImpl<OrderReportMapper, Order
 
     @Override
     public void generatePipeOrderReport(String acceptOrderId) {
+        if (acceptOrderMapper.selectById(acceptOrderId) == null) {
+            PipeTaskOrderDO pipeTaskOrderDO = pipeTaskOrderMapper.selectById(acceptOrderId);
+            if (pipeTaskOrderDO == null) {
+                throw new ServiceException(500, "受理单不存在");
+            }
+            acceptOrderId = pipeTaskOrderDO.getAcceptOrderId();
+        }
         OrderReportDO one = getOne(new LambdaQueryWrapperX<OrderReportDO>().eq(OrderReportDO::getAcceptOrderId, acceptOrderId));
         OrderReportDO orderReportDO = one == null ? new OrderReportDO() : one;
         orderReportDO.setAcceptOrderId(acceptOrderId);

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

@@ -908,7 +908,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                                 } else if ("STANDALONE".equals(recordReportDO.getProjectType())) {
                                     addReport1.setReportType(300);
                                     // 独审报告自动带出操作指导书
-                                    if (recordReportDO.getOperationInstruction() != null){
+                                    /*if (recordReportDO.getOperationInstruction() != null){
                                         PipeTaskOrderItemReportDO addInstructionReport = new PipeTaskOrderItemReportDO();
                                         addInstructionReport.setTemplateId(recordReportDO.getOperationInstruction());
                                         addInstructionReport.setOrderId(taskOrderDO.getId());
@@ -925,7 +925,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
                                         // 新增报告
                                         insertList.add(addInstructionReport);
-                                    }
+                                    }*/
                                 }
 
                                 //使用配置的项目名称
@@ -1655,7 +1655,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                             addReport.setReportType(300);
 
                             // 独审报告自动带出操作指导书
-                            if (connectDO.getOperationInstruction() != null){
+                            /*if (connectDO.getOperationInstruction() != null){
                                 PipeTaskOrderItemReportDO addInstructionReport = new PipeTaskOrderItemReportDO();
                                 addInstructionReport.setTemplateId(connectDO.getOperationInstruction());
                                 addInstructionReport.setOrderId(orderId);
@@ -1720,7 +1720,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                                     }
                                     pipeTaskOrderItemReportUserMapper.insert(taskOrderItemReportUserDO);
                                 }
-                            }
+                            }*/
                         }
                     }
                     if (Integer.valueOf(400).equals(reportTemplateDO.getTbType())) {