xuzhancheng преди 1 месец
родител
ревизия
598a2817f3

+ 13 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/orderreport/OrderReportController.java

@@ -92,4 +92,17 @@ public class OrderReportController {
                         BeanUtils.toBean(list, OrderReportRespVO.class));
     }
 
+    @GetMapping("/generateBoilerOrderReport/{acceptOrderId}")
+    @Operation(summary = "生成锅炉报告")
+    public CommonResult<Boolean> generateBoilerOrderReport(@PathVariable String acceptOrderId) {
+        orderReportService.generateBoilerOrderReport(acceptOrderId);
+        return success(true);
+    }
+
+    @GetMapping("/generatePipeOrderReport/{acceptOrderId}")
+    @Operation(summary = "生成管道报告")
+    public CommonResult<Boolean> generatePipeOrderReport(@PathVariable String acceptOrderId) {
+        orderReportService.generatePipeOrderReport(acceptOrderId);
+        return success(true);
+    }
 }

+ 3 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/util/AutoDataBoilerService.java

@@ -78,6 +78,9 @@ public class AutoDataBoilerService {
     public JSONObject autoGenerateBoilerRecordData(JSONObject jsonObject, String boilerTaskOrderItemReportDOId) {
         // 获取锅炉任务订单项目报告、订单、设备信息
         BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(boilerTaskOrderItemReportDOId);
+        if (itemReportDO == null){
+            return jsonObject;
+        }
         BoilerTaskOrderDO taskOrderDO = boilerTaskOrderMapper.selectById(itemReportDO.getOrderId());
         BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(itemReportDO.getOrderItemId());
         if (itemDO != null) {

+ 3 - 0
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/util/AutoDataPipeService.java

@@ -43,6 +43,9 @@ public class AutoDataPipeService {
 
     public JSONObject autoGeneratePipeRecordData(JSONObject jsonObject, String pipeTaskOrderItemReportDOId) {
         PipeTaskOrderItemReportDO itemReportDO = pipeTaskOrderItemReportMapper.selectById(pipeTaskOrderItemReportDOId);
+        if (itemReportDO == null){
+            return jsonObject;
+        }
         PipeTaskOrderDO taskOrderDO = pipeTaskOrderMapper.selectById(itemReportDO.getOrderId());
         jsonObject.put("reportNo", itemReportDO.getReportNo());