Merge remote-tracking branch 'origin/dev' into dev

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/boilertaskorderitemreport/BoilerTaskOrderItemReportDO.java

@@ -356,4 +356,13 @@ public class BoilerTaskOrderItemReportDO extends BaseDO {
      * 费用类型（1=法定，2=服务）
      */
     private String feeType;
+    /**
+     * 记录校核提交人
+     */
+    private String recheckSubmitId;
+    /**
+     * 记录校核提交时间
+     */
+    private LocalDateTime recheckSubmitTime;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/pipetaskorderitemreport/PipeTaskOrderItemReportDO.java

@@ -352,4 +352,13 @@ public class PipeTaskOrderItemReportDO extends BaseDO {
      * 费用类型（1=法定，2=服务）
      */
     private String feeType;
+    /**
+     * 记录校核提交人
+     */
+    private String recheckSubmitId;
+    /**
+     * 记录校核提交时间
+     */
+    private LocalDateTime recheckSubmitTime;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/acceptorder/AcceptOrderServiceImpl.java

@@ -935,6 +935,9 @@ public class AcceptOrderServiceImpl implements AcceptOrderService {
             }
         }
 
+        //设置查询设备类型
+        pageReqVO.setEquipMainType(200);
+
         PageResult<AcceptOrderDO> acceptOrderDOPageResult = acceptOrderMapper.selectPage(pageReqVO);
         PageResult<AcceptOrderRespVO> pageResult = BeanUtils.toBean(acceptOrderDOPageResult, AcceptOrderRespVO.class);
 
@@ -952,7 +955,7 @@ public class AcceptOrderServiceImpl implements AcceptOrderService {
 
         //user List
         Map<String, List<BoilerAcceptOrderUserDO>> userList = acceptOrderUserDOS.stream().collect(Collectors.groupingBy(BoilerAcceptOrderUserDO::getOrderId));
-        Map<String, List<PipeAcceptOrderUserDO>> userList1 = acceptOrderUserDOS1.stream().collect(Collectors.groupingBy(PipeAcceptOrderUserDO::getOrderId));
+//        Map<String, List<PipeAcceptOrderUserDO>> userList1 = acceptOrderUserDOS1.stream().collect(Collectors.groupingBy(PipeAcceptOrderUserDO::getOrderId));
         Map<String, BpmTaskDTO> bpmTaskDTOMap = bpmTaskApi.getLastTaskMap(processInstanceIds).getData();
 
         pageResult.getList().forEach(acceptOrder -> {
@@ -969,10 +972,10 @@ public class AcceptOrderServiceImpl implements AcceptOrderService {
             if (boilerUsers != null) {
                 checkerUserIds.addAll(boilerUsers);
             }
-            List<PipeAcceptOrderUserDO> pipeAcceptOrderUserDOS = userList1.get(acceptOrder.getId());
-            if (pipeAcceptOrderUserDOS != null) {
-                checkerUserIds.addAll(BeanUtils.toBean(pipeAcceptOrderUserDOS, BoilerAcceptOrderUserDO.class));
-            }
+//            List<PipeAcceptOrderUserDO> pipeAcceptOrderUserDOS = userList1.get(acceptOrder.getId());
+//            if (pipeAcceptOrderUserDOS != null) {
+//                checkerUserIds.addAll(BeanUtils.toBean(pipeAcceptOrderUserDOS, BoilerAcceptOrderUserDO.class));
+//            }
             acceptOrder.setCheckerUserIds(checkerUserIds);
 
         });

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/acceptorder/PipeAcceptOrderServiceImpl.java

@@ -941,6 +941,9 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
             }
         }
 
+        //设置查询设备类型
+        pageReqVO.setEquipMainType(300);
+
         PageResult<AcceptOrderDO> acceptOrderDOPageResult = acceptOrderMapper.selectPage(pageReqVO);
         PageResult<AcceptOrderRespVO> pageResult = BeanUtils.toBean(acceptOrderDOPageResult, AcceptOrderRespVO.class);
 
@@ -968,7 +971,12 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
             }
 
             acceptOrder.setDept(deptMap.get(acceptOrder.getDeptId()));
-//            acceptOrder.setCheckerUserIds(userList.get(acceptOrder.getId()));
+            List<PipeAcceptOrderUserDO> checkerUserIds = new ArrayList<>();
+            List<PipeAcceptOrderUserDO> pipeUsers = userList.get(acceptOrder.getId());
+            if (pipeUsers != null) {
+                checkerUserIds.addAll(pipeUsers);
+            }
+            acceptOrder.setCheckerUserIds(BeanUtils.toBean(checkerUserIds, BoilerAcceptOrderUserDO.class));
         });
 
         List<String> userIds = pageResult.getList().stream().map(AcceptOrderRespVO::getCurrentAuditorId).filter(Objects::nonNull).collect(Collectors.toList());
@@ -988,7 +996,10 @@ public class PipeAcceptOrderServiceImpl implements PipeAcceptOrderService {
 
                 if(acceptOrder.getCheckerUserIds() != null){
                     acceptOrder.getCheckerUserIds().forEach(checkerUserId -> {
-                        acceptOrder.getCheckers().add(userMap.get(checkerUserId.getUserId()));
+                        AdminUserRespDTO e = userMap.get(checkerUserId.getUserId());
+                        if (e != null){
+                            acceptOrder.getCheckers().add(e);
+                        }
                     });
                 }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -4334,6 +4334,8 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
     @Override
     public Boolean recheckOrderItem(RecheckOrderItemVO recheckOrderItemVO) {
 
+        String userId = getLoginUserId();
+
         BoilerTaskOrderItemReportDO taskOrderItemReportDO = new BoilerTaskOrderItemReportDO();
         taskOrderItemReportDO.setId(recheckOrderItemVO.getId());
         taskOrderItemReportDO.setRecheckId(recheckOrderItemVO.getRecheckId());
@@ -4353,6 +4355,8 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
         taskOrderItemReportDO.setRecheckStatus(100);
         taskOrderItemReportDO.setTaskStatus(TaskOrderStatusEnum.RECHECK.getStatus());
+        taskOrderItemReportDO.setRecheckSubmitId(userId);
+        taskOrderItemReportDO.setRecheckSubmitTime(LocalDateTime.now());
 
         BoilerTaskOrderItemReportDO oldReport = taskOrderItemReportMapper.selectById(recheckOrderItemVO.getId());
         if (oldReport.getReportType() != null && oldReport.getReportType() == 400) {

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

@@ -3,17 +3,25 @@ package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
 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.boilertaskorderuser.BoilerTaskOrderUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
 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.boilertaskorderuser.BoilerTaskOrderUserMapper;
 import cn.start.tz.module.pressure2.dal.mysql.equipboiler.EquipBoilerMapper;
 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.GenerateReportJsonService;
+import cn.start.tz.module.system.api.user.AdminUserApi;
+import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson2.JSONObject;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
  * 电站锅炉内部检验结论报告
  */
@@ -35,6 +43,12 @@ public class QC10038_202401ReportOFData implements IDynamicOFData {
     @Resource
     private GenerateReportJsonService generateReportJsonService;
 
+    @Resource
+    private BoilerTaskOrderUserMapper boilerTaskOrderUserMapper;
+
+    @Resource
+    private AdminUserApi adminUserApi;
+
     @Override
     public JSONObject getOFData(JSONObject params) {
         return null;
@@ -60,6 +74,19 @@ public class QC10038_202401ReportOFData implements IDynamicOFData {
                 result.put("factoryCode", equipBoilerDO.getFactoryCode());
             }
 
+            List<BoilerTaskOrderUserDO> checkUserList = boilerTaskOrderUserMapper.selectList(BoilerTaskOrderUserDO::getOrderId,itemReportDO.getOrderId());
+            if (!checkUserList.isEmpty()){
+                List<AdminUserRespDTO> userList = adminUserApi.getUserList(checkUserList.stream().map(BoilerTaskOrderUserDO::getUserId).toList()).getData();
+                if (!userList.isEmpty()){
+                    String checkNames = userList.stream()
+                            .map(AdminUserRespDTO::getSignUrl)
+                            .filter(Objects::nonNull) // 过滤掉null值
+                            .filter(signUrl -> !signUrl.isEmpty()) // 过滤掉空字符串
+                            .collect(Collectors.joining(","));
+                    result.put("checkNames",checkNames);
+                }
+            }
+
             result.put("ownerUnit", ""); //产权使用单位
         }
 

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（1）
+ */
+@Service("QC10041_202400ReportOFData")
+public class QC10041_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（2）
+ */
+@Service("QC10042_202400ReportOFData")
+public class QC10042_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（3）
+ */
+@Service("QC10043_202400ReportOFData")
+public class QC10043_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（4）
+ */
+@Service("QC10044_202400ReportOFData")
+public class QC10044_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（5）
+ */
+@Service("QC10045_202400ReportOFData")
+public class QC10045_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（6）
+ */
+@Service("QC10046_202400ReportOFData")
+public class QC10046_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（7）
+ */
+@Service("QC10047_202400ReportOFData")
+public class QC10047_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（8）
+ */
+@Service("QC10048_202400ReportOFData")
+public class QC10048_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（9）
+ */
+@Service("QC10049_202400ReportOFData")
+public class QC10049_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（10）
+ */
+@Service("QC10050_202400ReportOFData")
+public class QC10050_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（11）
+ */
+@Service("QC10051_202400ReportOFData")
+public class QC10051_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（12）
+ */
+@Service("QC10052_202400ReportOFData")
+public class QC10052_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（13）
+ */
+@Service("QC10053_202400ReportOFData")
+public class QC10053_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（14）
+ */
+@Service("QC10054_202400ReportOFData")
+public class QC10054_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（15）
+ */
+@Service("QC10055_202400ReportOFData")
+public class QC10055_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（16）
+ */
+@Service("QC10056_202400ReportOFData")
+public class QC10056_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查报告（17）
+ */
+@Service("QC10057_202400ReportOFData")
+public class QC10057_202400ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（10）
+ */
+@Service("QC10104_20240010ReportOFData")
+public class QC10104_20240010ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（11）
+ */
+@Service("QC10104_20240011ReportOFData")
+public class QC10104_20240011ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（12）
+ */
+@Service("QC10104_20240012ReportOFData")
+public class QC10104_20240012ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（13）
+ */
+@Service("QC10104_20240013ReportOFData")
+public class QC10104_20240013ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（14）
+ */
+@Service("QC10104_20240014ReportOFData")
+public class QC10104_20240014ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（15）
+ */
+@Service("QC10104_20240015ReportOFData")
+public class QC10104_20240015ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（16）
+ */
+@Service("QC10104_20240016ReportOFData")
+public class QC10104_20240016ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（17）
+ */
+@Service("QC10104_20240017ReportOFData")
+public class QC10104_20240017ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（1）
+ */
+@Service("QC10104_2024001ReportOFData")
+public class QC10104_2024001ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（2）
+ */
+@Service("QC10104_2024002ReportOFData")
+public class QC10104_2024002ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（3）
+ */
+@Service("QC10104_2024003ReportOFData")
+public class QC10104_2024003ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（4）
+ */
+@Service("QC10104_2024004ReportOFData")
+public class QC10104_2024004ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（5）
+ */
+@Service("QC10104_2024005ReportOFData")
+public class QC10104_2024005ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（6）
+ */
+@Service("QC10104_2024006ReportOFData")
+public class QC10104_2024006ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（7）
+ */
+@Service("QC10104_2024007ReportOFData")
+public class QC10104_2024007ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（8）
+ */
+@Service("QC10104_2024008ReportOFData")
+public class QC10104_2024008ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

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

@@ -0,0 +1,68 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
+
+import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
+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.equipboiler.EquipBoilerDO;
+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.service.dynamicOFData.IDynamicOFData;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import com.alibaba.fastjson2.JSONObject;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电站锅炉宏观检查记录（9）
+ */
+@Service("QC10104_2024009ReportOFData")
+public class QC10104_2024009ReportOFData implements IDynamicOFData {
+
+    @Resource
+    private BoilerTaskOrderItemReportMapper boilerTaskOrderItemReportMapper;
+
+    @Resource
+    private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
+
+    @Resource
+    private EquipBoilerMapper equipBoilerMapper;
+
+    @Resource
+    private AutoDataBoilerService autoDataBoilerService;
+
+    @Resource
+    private GenerateReportJsonService generateReportJsonService;
+
+    @Override
+    public JSONObject getOFData(JSONObject params) {
+        return null;
+    }
+
+    @Override
+    public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+        //设备报表ID
+        String refId = ruleVO.getRefId();
+
+        JSONObject result = new JSONObject();
+        BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
+
+        if (itemReportDO != null) {
+            String orderItemId = itemReportDO.getOrderItemId();
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
+
+            result = generateReportJsonService.generateReportFromRecord(ruleVO.getReportType(), ruleVO.getTemplateId(), refId);
+            result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
+
+            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
+            if (equipBoilerDO != null) {
+                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+            }
+
+            result.put("ownerUnit", ""); //产权使用单位
+        }
+
+        return result;
+    }
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamictb/DynamicTbServiceImpl.java

@@ -89,6 +89,8 @@ public class DynamicTbServiceImpl extends ServiceImpl<DynamicTbMapper, DynamicTb
     public void updateDynamicTb(DynamicTbSaveReqVO updateReqVO) {
         // 校验存在
         validateDynamicTbExists(updateReqVO.getId());
+        // 校验tbCode唯一性
+        validateTbCodeUnique(updateReqVO.getTbCode());
         // 更新
         DynamicTbDO updateObj = BeanUtils.toBean(updateReqVO, DynamicTbDO.class);
         dynamicTbMapper.updateById(updateObj);

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

@@ -3302,6 +3302,8 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
     @Override
     public Boolean recheckOrderItem(RecheckOrderItemVO recheckOrderItemVO) {
 
+        String userId = getLoginUserId();
+
         PipeTaskOrderItemReportDO taskOrderItemReportDO = new PipeTaskOrderItemReportDO();
         taskOrderItemReportDO.setId(recheckOrderItemVO.getId());
         taskOrderItemReportDO.setRecheckId(recheckOrderItemVO.getRecheckId());
@@ -3321,6 +3323,8 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         taskOrderItemReportDO.setRecheckStatus(100);
         taskOrderItemReportDO.setTaskStatus(TaskOrderStatusEnum.RECHECK.getStatus());
+        taskOrderItemReportDO.setRecheckSubmitId(userId);
+        taskOrderItemReportDO.setRecheckSubmitTime(LocalDateTime.now());
 
         PipeTaskOrderItemReportDO oldReport = taskOrderItemReportMapper.selectById(recheckOrderItemVO.getId());
         if (oldReport.getReportType() != null && oldReport.getReportType() == 400) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/boilertaskorderitem/BoilerTaskOrderItemMapper.xml

@@ -150,7 +150,7 @@
         select rownum,a.* from (
         select btoi.ID,
         bto.ORDER_NO,bto.MANAGER_ID,bto.UNIT_NAME,bto.UNIT_CODE,bto.CHECK_TYPE,bto.CHECK_DATE,bto.REASON,
-        bto.SUBMIT_ID,bto.SUBMIT_TIME,eb.EQUIP_DISTRICT,eb.EQUIP_STREET,eb.PRODUCT_CODE,eb.EQUIP_CODE,
+        bto.SUBMIT_ID,btoir.RECHECK_SUBMIT_TIME as SUBMIT_TIME,eb.EQUIP_DISTRICT,eb.EQUIP_STREET,eb.PRODUCT_CODE,eb.EQUIP_CODE,
         btoir.RECHECK_STATUS,btoir.STATUS,btoir.TASK_STATUS,btoir.RECHECK_REASON,btoir.RETURN_REASON,
         btoir.REPORT_NAME,btoir.REPORT_URL,btoir.ID as REPORT_ID,btoir.REPORT_TYPE,btoir.PREPARE_NAME,
         btoir.APPROVAL_NAME,btoir.RATIFY_NAME,btoir.RECHECK_NAME,btoir.IS_REPORTED,btoir.PROCESS_INSTANCE_ID,
@@ -239,7 +239,7 @@
         select count(1) from (
         select btoi.ID,
         bto.ORDER_NO,bto.MANAGER_ID,bto.UNIT_NAME,bto.UNIT_CODE,bto.CHECK_TYPE,bto.CHECK_DATE,bto.REASON,
-        bto.SUBMIT_ID,bto.SUBMIT_TIME,eb.EQUIP_DISTRICT,eb.EQUIP_STREET,eb.PRODUCT_CODE,eb.EQUIP_CODE,
+        bto.SUBMIT_ID,btoir.RECHECK_SUBMIT_TIME as SUBMIT_TIME,eb.EQUIP_DISTRICT,eb.EQUIP_STREET,eb.PRODUCT_CODE,eb.EQUIP_CODE,
         btoir.RECHECK_STATUS,btoir.STATUS,btoir.TASK_STATUS,btoir.RECHECK_REASON,btoir.RETURN_REASON,
         btoir.REPORT_NAME,btoir.REPORT_URL,btoir.ID as REPORT_ID,btoir.REPORT_TYPE,btoir.PREPARE_NAME,
         btoir.APPROVAL_NAME,btoir.RATIFY_NAME,btoir.RECHECK_NAME,btoir.IS_REPORTED,btoir.PROCESS_INSTANCE_ID,

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/pipetaskorderitem/PipeTaskOrderItemMapper.xml

@@ -144,7 +144,7 @@
         select rownum,a.* from (
         select btoi.ID,
         bto.ORDER_NO,bto.MANAGER_ID,bto.UNIT_NAME,bto.UNIT_CODE,bto.CHECK_TYPE,bto.CHECK_DATE,bto.REASON,
-        bto.SUBMIT_ID,bto.SUBMIT_TIME,
+        bto.SUBMIT_ID,btoir.RECHECK_SUBMIT_TIME as SUBMIT_TIME,
         btoir.RECHECK_STATUS,btoir.STATUS,btoir.TASK_STATUS,btoir.RECHECK_REASON,btoir.RETURN_REASON,
         btoir.REPORT_NAME,btoir.REPORT_URL,btoir.ID as REPORT_ID,btoir.REPORT_TYPE,btoir.PREPARE_NAME,
         btoir.APPROVAL_NAME,btoir.RATIFY_NAME,btoir.RECHECK_NAME,btoir.IS_REPORTED,btoir.PROCESS_INSTANCE_ID,
@@ -238,7 +238,7 @@
         select count(*) from (
         select btoi.ID,
         bto.ORDER_NO,bto.MANAGER_ID,bto.UNIT_NAME,bto.UNIT_CODE,bto.CHECK_TYPE,bto.CHECK_DATE,bto.REASON,
-        bto.SUBMIT_ID,bto.SUBMIT_TIME,
+        bto.SUBMIT_ID,btoir.RECHECK_SUBMIT_TIME as SUBMIT_TIME,
         btoir.RECHECK_STATUS,btoir.STATUS,btoir.TASK_STATUS,btoir.RECHECK_REASON,btoir.RETURN_REASON,
         btoir.REPORT_NAME,btoir.REPORT_URL,btoir.ID as REPORT_ID,btoir.REPORT_TYPE,btoir.PREPARE_NAME,
         btoir.APPROVAL_NAME,btoir.RATIFY_NAME,btoir.RECHECK_NAME,btoir.IS_REPORTED,btoir.PROCESS_INSTANCE_ID,