报表调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QC10086_202400RecordOFData.java

@@ -75,6 +75,7 @@ public class QC10086_202400RecordOFData implements IDynamicOFData {
             if (equipBoilerDO != null){
                 //设备信息
                 result.put("workPressure",equipBoilerDO.getWorkpressure());
+                result.put("usePressure",equipBoilerDO.getUsepressure());
 
                 if (equipBoilerDO.getNextInCheckDate() != null){
                     result.put("nextInCheckDate",equipBoilerDO.getNextInCheckDate().format(dateFormat));

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC47004_202400RecordOFData.java

@@ -2,9 +2,12 @@ package cn.start.tz.module.pressure2.service.dynamicOFData.comm;
 
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
+import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitemreport.BoilerTaskOrderItemReportMapper;
+import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOrderItemReportMapper;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataPipeService;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
 import com.alibaba.fastjson2.JSONObject;
 import jakarta.annotation.Resource;
@@ -19,12 +22,18 @@ public class QC47004_202400RecordOFData implements IDynamicOFData {
     @Resource
     private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
 
+    @Resource
+    private PipeTaskOrderItemReportMapper pipeTaskOrderItemReportMapper;
+
     @Resource
     private GenerateReportJsonService generateReportJsonService;
 
     @Resource
     private AutoDataBoilerService autoDataBoilerService;
 
+    @Resource
+    private AutoDataPipeService autoDataPipeService;
+
     @Override
     public JSONObject getOFData(JSONObject params) {
         return null;
@@ -32,16 +41,35 @@ public class QC47004_202400RecordOFData implements IDynamicOFData {
 
     @Override
     public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+
         //设备报表ID
         String refId = ruleVO.getRefId();
 
+        //主设备类型
+        String equipMainTpe = ruleVO.getParams().getString("equipMainType");
+
         JSONObject result = new JSONObject();
-        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
 
-        if (itemReportDO != null) {
-            //根据记录字段动态生成报告字段
-            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
-            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+        if (equipMainTpe.equals("boiler")){
+
+            BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+            if (itemReportDO != null) {
+                //根据记录字段动态生成报告字段
+                result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+                result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+            }
+
+        }else if (equipMainTpe.equals("pipe")){
+
+            PipeTaskOrderItemReportDO itemReportDO = pipeTaskOrderItemReportMapper.selectById(refId);
+
+            if (itemReportDO != null) {
+                //根据记录字段动态生成报告字段
+                result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+                result = autoDataPipeService.autoGeneratePipeReportData(result, refId);
+            }
+
         }
 
         return result;

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC47028_202400RecordOFData.java

@@ -1,15 +1,29 @@
 package cn.start.tz.module.pressure2.service.dynamicOFData.comm;
 
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+import cn.start.tz.module.pressure2.controller.admin.equipboiler.vo.EquipBoilerReportVO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTaskOrderItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
+import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
+import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitem.PipeTaskOrderItemDO;
+import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
+import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitem.BoilerTaskOrderItemMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitemreport.BoilerTaskOrderItemReportMapper;
+import cn.start.tz.module.pressure2.dal.mysql.equipboiler.EquipBoilerMapper;
+import cn.start.tz.module.pressure2.dal.mysql.equippipe.EquipPipeMapper;
+import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitem.PipeTaskOrderItemMapper;
+import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOrderItemReportMapper;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataPipeService;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 内窥镜检测记录
  */
@@ -25,6 +39,24 @@ public class QC47028_202400RecordOFData implements IDynamicOFData {
     @Resource
     private AutoDataBoilerService autoDataBoilerService;
 
+    @Resource
+    private AutoDataPipeService autoDataPipeService;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private PipeTaskOrderItemReportMapper pipeTaskOrderItemReportMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private PipeTaskOrderItemMapper pipeTaskOrderItemMapper;
+
+    @Resource
+    private EquipPipeMapper equipPipeMapper;
+
     @Override
     public JSONObject getOFData(JSONObject params) {
         return null;
@@ -32,16 +64,61 @@ public class QC47028_202400RecordOFData implements IDynamicOFData {
 
     @Override
     public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+
         //设备报表ID
         String refId = ruleVO.getRefId();
 
+        //主设备类型
+        String equipMainTpe = ruleVO.getParams().getString("equipMainType");
+
         JSONObject result = new JSONObject();
-        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
 
-        if (itemReportDO != null) {
-            //根据记录字段动态生成报告字段
-            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
-            result = autoDataBoilerService.autoGenerateBoilerRecordData(result, refId);
+        if (equipMainTpe.equals("boiler")){
+
+            BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+            if (itemReportDO != null) {
+                //根据记录字段动态生成报告字段
+                result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+                result = autoDataBoilerService.autoGenerateBoilerRecordData(result, refId);
+
+                String orderItemId = itemReportDO.getOrderItemId();
+                BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+                EquipBoilerReportVO equipBoilerDO = equipBoilerMapper.selectDetailsById(itemDO.getEquipId());
+
+                // 设置设备编码
+                if (equipBoilerDO != null){
+                    result.put("equipCode",(equipBoilerDO.getFactoryCode() == null ? " - " : equipBoilerDO.getFactoryCode())
+                            + "/" + (equipBoilerDO.getEquipCode() == null ? " - " : equipBoilerDO.getEquipCode()));
+                }
+
+            }
+
+        }else if (equipMainTpe.equals("pipe")){
+
+            PipeTaskOrderItemReportDO itemReportDO = pipeTaskOrderItemReportMapper.selectById(refId);
+
+            if (itemReportDO != null) {
+                //根据记录字段动态生成报告字段
+                result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+                result = autoDataPipeService.autoGeneratePipeRecordData(result, refId);
+
+                List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
+                        .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
+                if (!itemDOList.isEmpty()){
+                    //设备信息
+                    if (itemDOList.size() > 1){
+                        result.put("equipCode","见一览表");
+                    }else {
+                        EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                        if (equipDO != null){
+                            result.put("equipCode",equipDO.getProjectNo());
+                        }
+                    }
+                }
+
+            }
+
         }
 
         return result;

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC52044_202401RecordOFData.java

@@ -115,7 +115,8 @@ public class QC52044_202401RecordOFData implements IDynamicOFData {
 
                 // 设置设备编码
                 if (equipBoilerDO != null){
-                    result.put("equipCode",equipBoilerDO.getFactoryCode() + "/" + equipBoilerDO.getEquipCode());
+                    result.put("equipCode",(equipBoilerDO.getFactoryCode() == null ? " - " : equipBoilerDO.getFactoryCode())
+                            + "/" + (equipBoilerDO.getEquipCode() == null ? " - " : equipBoilerDO.getEquipCode()));
                 }
 
                 result.put("reportNo",itemReportDO.getReportNo());