12024报表调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12024_202403JRecordOFData.java

@@ -148,13 +148,23 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                     List<EquipPipeDetailDO> equipPipeDetailDOList = equipPipeDetailMapper.selectList(new LambdaQueryWrapper<EquipPipeDetailDO>()
                             .in(EquipPipeDetailDO::getId, allDetailDOS.stream().map(PipeTaskOrderItemDetailDO::getEquipDetailId).toList()));
                     if (equipPipeDetailDOList.size() > 1){
-                        result.put("pipeName","见一览表" );
                         result.put("designLifeYears", "-");
                     }else if (equipPipeDetailDOList.size() == 1){
-                        result.put("pipeName", equipPipeDetailDOList.get(0).getPipeName());
                         result.put("designLifeYears", equipPipeDetailDOList.get(0).getDesignLifeYears());
                     }
 
+                    if (!equipPipeDetailDOList.isEmpty()) {
+                        // 判断pipeName是否相同
+                        String pipeNameValue;
+                        Set<String> pipeNames = equipPipeDetailDOList.stream()
+                                .map(EquipPipeDetailDO::getPipeName)
+                                .filter(Objects::nonNull)
+                                .collect(Collectors.toSet());
+                        // 如果只有一个唯一的pipeName值，则使用该值；否则设置为"见一览表"
+                        pipeNameValue = pipeNames.size() == 1 ? pipeNames.iterator().next() : "见一览表";
+                        result.put("pipeName", pipeNameValue);
+                    }
+
                     if (!equipPipeDetailDOList.isEmpty()) {
                         // 判断pipeLevel是否相同
                         String pipeLevelValue;
@@ -175,9 +185,11 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                     result.put("projectName", "见一览表");
                     result.put("layingMode", "-");
                 } else {
-                    result.put("layingMode", equipPipeDO.getLayingMode());
-                    result.put("projectNo", equipPipeDO.getProjectNo());
-                    result.put("projectName", equipPipeDO.getProjectName());
+                    if (equipPipeDO != null) {
+                        result.put("projectNo", equipPipeDO.getProjectNo());
+                        result.put("projectName", equipPipeDO.getProjectName());
+                        result.put("layingMode", equipPipeDO.getLayingMode());
+                    }
                 }
 
             }
@@ -192,10 +204,6 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                 List<PipeTaskOrderUserDO> checkUserList = pipeTaskOrderUserMapper.selectList(PipeTaskOrderUserDO::getOrderId,itemReportDO.getOrderId());
                 InspectorInfoPipeUtil.fillInspectorSignatures(result, checkUserList, taskOrderDO.getManagerId(), adminUserApi);
 
-//                AdminUserRespDTO userInfo = adminUserApi.getUser(taskOrderDO.getManagerId()).getData();
-//                if (userInfo != null) {
-//                    result.put("checkName", userInfo.getSignUrl());
-//                }
             }
 
             //审核人员信息