报表调整

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

@@ -1046,6 +1046,9 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         taskOrderItem.setMainChecker(getLoginUserId());
         boilerTaskOrderItemMapper.updateById(taskOrderItem);
 
+        //认领时同步报表
+        syncAllReportDataByOrderItemId(new BoilerTaskOrderSyncReportVO().setOrderItemId(orderItemIdVO.getId()));
+
         return true;
     }
 
@@ -1367,17 +1370,18 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
             boilerTaskOrderItemMapper.updateById(orderItemDO);
 
             //更新结论报告封面
-            List<BoilerTaskOrderItemReportDO> taskOrderItemReportDOS = taskOrderItemReportMapper.selectList(BoilerTaskOrderItemReportDO::getOrderItemId, dateVO.getId());
-            if (!taskOrderItemReportDOS.isEmpty()){
-                taskOrderItemReportDOS.forEach(item -> {
-                    if (item.getResultTemplateId() != null){
-                        BoilerTaskOrderSyncReportVO syncReportVO = new BoilerTaskOrderSyncReportVO();
-                        syncReportVO.setRefId(item.getId());
-                        syncReportVO.setReportType("result");
-                        syncReportData(syncReportVO);
-                    }
-                });
-            }
+            syncAllReportDataByOrderItemId(new BoilerTaskOrderSyncReportVO().setOrderItemId(dateVO.getId()));
+//            List<BoilerTaskOrderItemReportDO> taskOrderItemReportDOS = taskOrderItemReportMapper.selectList(BoilerTaskOrderItemReportDO::getOrderItemId, dateVO.getId());
+//            if (!taskOrderItemReportDOS.isEmpty()){
+//                taskOrderItemReportDOS.forEach(item -> {
+//                    if (item.getResultTemplateId() != null){
+//                        BoilerTaskOrderSyncReportVO syncReportVO = new BoilerTaskOrderSyncReportVO();
+//                        syncReportVO.setRefId(item.getId());
+//                        syncReportVO.setReportType("result");
+//                        syncReportData(syncReportVO);
+//                    }
+//                });
+//            }
         }
 
     }

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

@@ -86,19 +86,6 @@ public class QC10023_202400ReportOFData implements IDynamicOFData {
             result = autoDataBoilerService.autoGenerateBoilerReportData(result, refId);
             //主报告二维码
             result.put("qrCode",itemReportDO.getQrCodeUrl());
-            //检验员信息
-            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);
-                }
-            }
 
         }
 

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

@@ -16,6 +16,7 @@ import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderuser.BoilerTaskOrde
 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.GenerateReportJsonService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.InspectorInfoUtil;
 import cn.start.tz.module.pressure2.service.dynamictbcol.DynamicTbColService;
 import cn.start.tz.module.pressure2.service.dynamictbval.DynamicTbValService;
 import cn.start.tz.module.system.api.user.AdminUserApi;
@@ -91,7 +92,6 @@ public class QC10033_202400ReportOFData implements IDynamicOFData {
             if (equipBoilerDO != null){
                 //设备信息
                 result.put("workPressure",equipBoilerDO.getWorkpressure());
-                result.put("workTemperature",equipBoilerDO.getOilEquipBackTemp());
                 result.put("testMedium",equipBoilerDO.getTestmedium());
             }
 
@@ -112,46 +112,7 @@ public class QC10033_202400ReportOFData implements IDynamicOFData {
 
             //检验员信息
             List<BoilerTaskOrderUserDO> checkUserList = boilerTaskOrderUserMapper.selectList(BoilerTaskOrderUserDO::getOrderId,itemReportDO.getOrderId());
-            // 如果mainChecker不为空且不在checkUserList中，则添加
-            if (itemDO.getMainChecker() != null){
-                boolean hasMainChecker = checkUserList.stream()
-                        .anyMatch(user -> itemDO.getMainChecker().equals(user.getUserId()));
-                if (!hasMainChecker) {
-                    BoilerTaskOrderUserDO mainCheckerUser = new BoilerTaskOrderUserDO();
-                    mainCheckerUser.setUserId(itemDO.getMainChecker());
-                    mainCheckerUser.setOrderId(itemReportDO.getOrderId());
-                    checkUserList.add(mainCheckerUser);
-                }
-            }
-            if (!checkUserList.isEmpty()){
-                List<AdminUserRespDTO> userList = adminUserApi.getUserList(checkUserList.stream().map(BoilerTaskOrderUserDO::getUserId).toList()).getData();
-                if (!userList.isEmpty()){
-                    // 将mainChecker对应的用户排在第一个
-                    if (itemDO.getMainChecker() != null) {
-                        userList.sort((u1, u2) -> {
-                            if (itemDO.getMainChecker().equals(u1.getId())) {
-                                return -1;
-                            } else if (itemDO.getMainChecker().equals(u2.getId())) {
-                                return 1;
-                            }
-                            return 0;
-                        });
-                    }
-                    AtomicInteger number = new AtomicInteger(1);
-                    for (AdminUserRespDTO adminUserRespDTO : userList) {
-                        if (adminUserRespDTO.getSignUrl() != null && !adminUserRespDTO.getSignUrl().isEmpty()){
-                            result.put("checkName_" + number.get(), adminUserRespDTO.getSignUrl());
-                            number.getAndIncrement();
-                        }
-                    }
-                    // 如果个数小于7，将后面的checkName都改成空白
-                    if (number.get() < 7){
-                        for (int i = number.get(); i <= 7; i++) {
-                            result.put("checkName_" + i, " ");
-                        }
-                    }
-                }
-            }
+            InspectorInfoUtil.fillInspectorSignatures(result, checkUserList, itemDO.getMainChecker(), adminUserApi);
 
             //编制人员信息
             AdminUserRespDTO userInfo = adminUserApi.getUser(itemReportDO.getPrepareId()).getData();

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

@@ -13,6 +13,7 @@ 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.pressure2.service.dynamicOFData.util.InspectorInfoUtil;
 import cn.start.tz.module.system.api.user.AdminUserApi;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson2.JSONObject;
@@ -76,47 +77,9 @@ public class QC10035_202401ReportOFData implements IDynamicOFData {
                 result.put("factoryCode", equipBoilerDO.getFactoryCode());
             }
 
+            //检验员信息
             List<BoilerTaskOrderUserDO> checkUserList = boilerTaskOrderUserMapper.selectList(BoilerTaskOrderUserDO::getOrderId,itemReportDO.getOrderId());
-            // 如果mainChecker不为空且不在checkUserList中，则添加
-            if (itemDO.getMainChecker() != null){
-                boolean hasMainChecker = checkUserList.stream()
-                    .anyMatch(user -> itemDO.getMainChecker().equals(user.getUserId()));
-                if (!hasMainChecker) {
-                    BoilerTaskOrderUserDO mainCheckerUser = new BoilerTaskOrderUserDO();
-                    mainCheckerUser.setUserId(itemDO.getMainChecker());
-                    mainCheckerUser.setOrderId(itemReportDO.getOrderId());
-                    checkUserList.add(mainCheckerUser);
-                }
-            }
-            if (!checkUserList.isEmpty()){
-                List<AdminUserRespDTO> userList = adminUserApi.getUserList(checkUserList.stream().map(BoilerTaskOrderUserDO::getUserId).toList()).getData();
-                if (!userList.isEmpty()){
-                    // 将mainChecker对应的用户排在第一个
-                    if (itemDO.getMainChecker() != null) {
-                        userList.sort((u1, u2) -> {
-                            if (itemDO.getMainChecker().equals(u1.getId())) {
-                                return -1;
-                            } else if (itemDO.getMainChecker().equals(u2.getId())) {
-                                return 1;
-                            }
-                            return 0;
-                        });
-                    }
-                    AtomicInteger number = new AtomicInteger(1);
-                    for (AdminUserRespDTO adminUserRespDTO : userList) {
-                        if (adminUserRespDTO.getSignUrl() != null && !adminUserRespDTO.getSignUrl().isEmpty()){
-                            result.put("checkName_" + number.get(), adminUserRespDTO.getSignUrl());
-                            number.getAndIncrement();
-                        }
-                    }
-                    // 如果个数小于7，将后面的checkName都改成空白
-                    if (number.get() < 7){
-                        for (int i = number.get(); i <= 7; i++) {
-                            result.put("checkName_" + i, " ");
-                        }
-                    }
-                }
-            }
+            InspectorInfoUtil.fillInspectorSignatures(result, checkUserList, itemDO.getMainChecker(), adminUserApi);
 
             result.put("ownerUnit", ""); //产权使用单位
         }

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

@@ -13,6 +13,7 @@ import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderuser.BoilerTaskOrde
 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.InspectorInfoUtil;
 import cn.start.tz.module.system.api.user.AdminUserApi;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import com.alibaba.fastjson2.JSONObject;
@@ -64,70 +65,16 @@ public class QC10089_202400RecordOFData implements IDynamicOFData {
 
         //设备报表ID
         String refId = ruleVO.getRefId();
-        //检验员ID
-        String checkUserId = ruleVO.getParams().getString("checkUserId");
 
         JSONObject result = new JSONObject();
         BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
         result = autoDataBoilerService.autoGenerateBoilerRecordData(result, refId);
         if (itemReportDO != null){
 
-           /* String orderItemId = itemReportDO.getOrderItemId();
-            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);
-            EquipBoilerReportVO equipBoilerDO = equipBoilerMapper.selectDetailsById(itemDO.getEquipId());
-            if (equipBoilerDO != null){
-                //设备信息
-                result.put("contact",equipBoilerDO.getContact());
-                result.put("contactPhone",equipBoilerDO.getContactPhone());
-                result.put("boilerModel",equipBoilerDO.getBoilerModel());
-                result.put("productCode",equipBoilerDO.getProductCode());
-                result.put("equipCode",equipBoilerDO.getEquipCode());
-                result.put("useRegisterNo",equipBoilerDO.getUseRegisterNo());
-                result.put("unitName",equipBoilerDO.getUnitName());
-
-                result.put("ratedPressure",equipBoilerDO.getRatedPressure());
-                //result.put("designWorkPressure",equipBoilerDO.getDesignWorkPressure());
-                result.put("ratedOutpower",equipBoilerDO.getRatedOutput());
-                result.put("installUnit",equipBoilerDO.getInstallUnit());
-            }
-
-            result.put("reportNo",itemReportDO.getReportNo());*/
-
             //检验员信息
+            BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(itemReportDO.getOrderItemId());
             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);
-                }
-            }
-
-          /*  //检验员信息
-            String orderId = itemReportDO.getOrderId();
-            BoilerTaskOrderDO taskOrderDO =  boilerTaskOrderMapper.selectById(orderId);
-            if (taskOrderDO != null){
-                result.put("checkDate",taskOrderDO.getCheckDate().format(dateFormat));
-            }
-            AdminUserRespDTO userInfo = adminUserApi.getUser(checkUserId).getData();
-            if (userInfo != null){
-                result.put("checkName",userInfo.getSignUrl());
-            }
-
-            //校验人员信息
-            userInfo = adminUserApi.getUser(itemReportDO.getRecheckId()).getData();
-            if (userInfo != null){
-                result.put("recheckName",userInfo.getSignUrl());
-            }else{
-                result.put("recheckName",itemReportDO.getRecheckName());
-            }
-            if (itemReportDO.getRecheckDate() != null){
-                result.put("recheckDate",itemReportDO.getRecheckDate().format(dateFormat));
-            }*/
+            InspectorInfoUtil.fillInspectorSignatures(result, checkUserList, itemDO.getMainChecker(), adminUserApi);
 
         }
 

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

@@ -5,6 +5,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorder.BoilerTaskOrd
 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.dataobject.pipetaskorderinput.PipeTaskOrderInputDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorder.BoilerTaskOrderMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitem.BoilerTaskOrderItemMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitemreport.BoilerTaskOrderItemReportMapper;
@@ -12,10 +13,16 @@ 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.pressure2.service.pipetaskorderinput.PipeTaskOrderInputService;
+import cn.start.tz.module.system.api.clientunit.ClientUnitApi;
+import cn.start.tz.module.system.api.clientunit.dto.ClientUnitDTO;
+import cn.start.tz.module.system.api.clientunit.dto.ClientUnitPageDTO;
 import com.alibaba.fastjson2.JSONObject;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
+import java.time.format.DateTimeFormatter;
+
 /**
  * 电站锅炉定期检验记录
  */
@@ -40,6 +47,9 @@ public class QC10099_202401ReportOFData implements IDynamicOFData {
     @Resource
     private BoilerTaskOrderMapper boilerTaskOrderMapper;
 
+    @Resource
+    private ClientUnitApi clientUnitApi;
+
     @Override
     public JSONObject getOFData(JSONObject params) {
         return null;
@@ -47,6 +57,10 @@ public class QC10099_202401ReportOFData implements IDynamicOFData {
 
     @Override
     public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+
+        //日期格式
+        DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
+
         //设备报表ID
         String refId = ruleVO.getRefId();
 
@@ -64,7 +78,21 @@ public class QC10099_202401ReportOFData implements IDynamicOFData {
             BoilerTaskOrderDO taskOrderDO = boilerTaskOrderMapper.selectById(itemReportDO.getOrderId());
             if (equipBoilerDO != null) {
                 result.put("factoryCode", equipBoilerDO.getFactoryCode());
+
+                if (itemDO.getEndCheckDate() != null){
+                    result.put("checkDate2", itemDO.getEndCheckDate().format(dateFormat));
+                }
+
+                //社会统一信用代码socialCreditCode
+                if (equipBoilerDO.getUnitCode() != null){
+                    ClientUnitDTO clientUnit = clientUnitApi.getClientUnitByCode(equipBoilerDO.getUnitCode()).getData();
+                    if (clientUnit !=  null){
+                        result.put("socialCreditCode", clientUnit.getSocialCreditCode());
+                    }
+                }
+
             }
+
             if (taskOrderDO != null) {
                 Integer checkType = taskOrderDO.getCheckType();
                 switch (checkType) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/util/InspectorInfoUtil.java

@@ -0,0 +1,99 @@
+package cn.start.tz.module.pressure2.service.dynamicOFData.util;
+
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderuser.BoilerTaskOrderUserDO;
+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 java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * 检验员信息处理工具类
+ */
+public class InspectorInfoUtil {
+
+    /**
+     * 填充检验员签名信息到结果对象中
+     * 
+     * @param result 结果JSONObject
+     * @param checkUserList 检验员用户列表
+     * @param mainCheckerId 主检验员ID
+     * @param adminUserApi 用户API
+     * @param maxCount 最大检验员数量（默认7）
+     */
+    public static void fillInspectorSignatures(JSONObject result, 
+                                               List<BoilerTaskOrderUserDO> checkUserList,
+                                               String mainCheckerId,
+                                               AdminUserApi adminUserApi,
+                                               int maxCount) {
+        if (checkUserList == null || checkUserList.isEmpty() || adminUserApi == null) {
+            return;
+        }
+
+        // 如果mainChecker不为空且不在checkUserList中，则添加
+        if (mainCheckerId != null) {
+            boolean hasMainChecker = checkUserList.stream()
+                    .anyMatch(user -> mainCheckerId.equals(user.getUserId()));
+            if (!hasMainChecker) {
+                BoilerTaskOrderUserDO mainCheckerUser = new BoilerTaskOrderUserDO();
+                mainCheckerUser.setUserId(mainCheckerId);
+                checkUserList.add(mainCheckerUser);
+            }
+        }
+
+        // 获取用户信息
+        List<String> userIds = checkUserList.stream()
+                .map(BoilerTaskOrderUserDO::getUserId)
+                .toList();
+        
+        List<AdminUserRespDTO> userList = adminUserApi.getUserList(userIds).getData();
+        
+        if (userList == null || userList.isEmpty()) {
+            return;
+        }
+
+        // 将mainChecker对应的用户排在第一个
+        if (mainCheckerId != null) {
+            userList.sort((u1, u2) -> {
+                if (mainCheckerId.equals(u1.getId())) {
+                    return -1;
+                } else if (mainCheckerId.equals(u2.getId())) {
+                    return 1;
+                }
+                return 0;
+            });
+        }
+
+        // 填充签名信息
+        AtomicInteger number = new AtomicInteger(1);
+        for (AdminUserRespDTO adminUserRespDTO : userList) {
+            if (adminUserRespDTO.getSignUrl() != null && !adminUserRespDTO.getSignUrl().isEmpty()) {
+                result.put("checkName_" + number.get(), adminUserRespDTO.getSignUrl());
+                number.getAndIncrement();
+            }
+        }
+
+        // 如果个数小于maxCount，将后面的checkName都改成空白
+        if (number.get() < maxCount) {
+            for (int i = number.get(); i <= maxCount; i++) {
+                result.put("checkName_" + i, " ");
+            }
+        }
+    }
+
+    /**
+     * 填充检验员签名信息到结果对象中（默认最大数量为7）
+     * 
+     * @param result 结果JSONObject
+     * @param checkUserList 检验员用户列表
+     * @param mainCheckerId 主检验员ID
+     * @param adminUserApi 用户API
+     */
+    public static void fillInspectorSignatures(JSONObject result, 
+                                               List<BoilerTaskOrderUserDO> checkUserList,
+                                               String mainCheckerId,
+                                               AdminUserApi adminUserApi) {
+        fillInspectorSignatures(result, checkUserList, mainCheckerId, adminUserApi, 7);
+    }
+}

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

@@ -1084,6 +1084,9 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         updateInputDO.setMainChecker(getLoginUserId());
         pipeTaskOrderInputMapper.updateById(updateInputDO);
 
+        //认领时同步报表
+        syncAllReportDataByOrderId(new PipeTaskOrderSyncReportVO().setOrderId(taskOrderInputDO.getOrderId()));
+
         return true;
 
     }
@@ -4053,17 +4056,21 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
             pipeTaskOrderInputMapper.updateById(orderInputDO);
 
             //更新结论报告封面
-            List<PipeTaskOrderItemReportDO> taskOrderItemReportDOS = taskOrderItemReportMapper.selectList(PipeTaskOrderItemReportDO::getOrderId, dateVO.getOrderId());
-            if (!taskOrderItemReportDOS.isEmpty()){
-                taskOrderItemReportDOS.forEach(item -> {
-                    if (item.getResultTemplateId() != null){
-                        BoilerTaskOrderSyncReportVO syncReportVO = new BoilerTaskOrderSyncReportVO();
-                        syncReportVO.setRefId(item.getId());
-                        syncReportVO.setReportType("result");
-                        syncReportData(syncReportVO);
-                    }
-                });
-            }
+            PipeTaskOrderInputDO taskOrderInputDO = pipeTaskOrderInputMapper.selectById(dateVO.getId());
+            if (taskOrderInputDO != null){
+                syncAllReportDataByOrderId(new PipeTaskOrderSyncReportVO().setOrderId(taskOrderInputDO.getOrderId()));
+            }
+//            List<PipeTaskOrderItemReportDO> taskOrderItemReportDOS = taskOrderItemReportMapper.selectList(PipeTaskOrderItemReportDO::getOrderId, dateVO.getOrderId());
+//            if (!taskOrderItemReportDOS.isEmpty()){
+//                taskOrderItemReportDOS.forEach(item -> {
+//                    if (item.getResultTemplateId() != null){
+//                        BoilerTaskOrderSyncReportVO syncReportVO = new BoilerTaskOrderSyncReportVO();
+//                        syncReportVO.setRefId(item.getId());
+//                        syncReportVO.setReportType("result");
+//                        syncReportData(syncReportVO);
+//                    }
+//                });
+//            }
         }
 
     }