调整

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

@@ -134,43 +134,42 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                     result.put("undergroundLength", String.valueOf(sum1));
                 }
 
+                //获取约检管线
+                if (!allDetailDOS.isEmpty()){
+
+                    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()) {
+                        // 判断pipeLevel是否相同
+                        String pipeLevelValue;
+                        Set<String> pipeLevels = equipPipeDetailDOList.stream()
+                                .map(EquipPipeDetailDO::getPipeLevel)
+                                .filter(Objects::nonNull)
+                                .collect(Collectors.toSet());
+                        // 如果只有一个唯一的pipeLevel值，则使用该值；否则设置为"见一览表"
+                        pipeLevelValue = pipeLevels.size() == 1 ? pipeLevels.iterator().next() : "见一览表";
+                        result.put("pipeLevel", pipeLevelValue);
+                    }
+
+                }
+
                 //设备信息
                 if (itemDOList.size() > 1) {
-                    result.put("pipeLevel", "见一览表");
                     result.put("projectNo", "见一览表");
                     result.put("projectName", "见一览表");
-                    result.put("pipeName", "见一览表");
-                    result.put("layingMode", "见一览表");
-                    result.put("designLifeYears", "见一览表");
+                    result.put("layingMode", "-");
                 } else {
                     result.put("layingMode", equipPipeDO.getLayingMode());
                     result.put("projectNo", equipPipeDO.getProjectNo());
                     result.put("projectName", equipPipeDO.getProjectName());
-
-                    List<PipeTaskOrderItemDetailDO> detailDOS = pipeTaskOrderItemDetailMapper.selectList(PipeTaskOrderItemDetailDO::getOrderItemId, itemDOList.get(0).getId());
-                    if (!detailDOS.isEmpty()){
-
-                        List<EquipPipeDetailDO> equipPipeDetailDOList = equipPipeDetailMapper.selectList(new LambdaQueryWrapper<EquipPipeDetailDO>()
-                                .in(EquipPipeDetailDO::getId, detailDOS.stream().map(PipeTaskOrderItemDetailDO::getEquipDetailId).toList()));
-                        if (equipPipeDetailDOList.size() > 1){
-                            result.put("pipeName","见一览表" );
-                        }else if (equipPipeDetailDOList.size() == 1){
-                            result.put("pipeName", equipPipeDetailDOList.get(0).getPipeName());
-                        }
-
-                        if (!equipPipeDetailDOList.isEmpty()) {
-                            result.put("designLifeYears", equipPipeDetailDOList.get(0).getDesignLifeYears());
-                            // 判断pipeLevel是否相同
-                            String pipeLevelValue;
-                            Set<String> pipeLevels = equipPipeDetailDOList.stream()
-                                    .map(EquipPipeDetailDO::getPipeLevel)
-                                    .filter(Objects::nonNull)
-                                    .collect(Collectors.toSet());
-                            // 如果只有一个唯一的pipeLevel值，则使用该值；否则设置为"见一览表"
-                            pipeLevelValue = pipeLevels.size() == 1 ? pipeLevels.iterator().next() : "见一览表";
-                            result.put("pipeLevel", pipeLevelValue);
-                        }
-                    }
                 }
 
             }