报表服务调整

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

@@ -31,6 +31,8 @@ import org.springframework.stereotype.Service;
 
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -106,7 +108,7 @@ public class QC12016_202401JRecordOFData implements IDynamicOFData {
                     result.put("unitCode","见一览表");
                     result.put("unitName","见一览表");
                     result.put("unitAddress","见一览表");
-                    result.put("pipeClass", "见一览表");
+                    result.put("pipeLevel", "见一览表");
                 }else {
                     if (equipPipeDO != null){
                         result.put("unitCode",equipPipeDO.getUnitCode());
@@ -117,7 +119,7 @@ public class QC12016_202401JRecordOFData implements IDynamicOFData {
                         result.put("certificateNo",equipPipeDO.getCertificateNo());
 
                         result.put("securityMan",equipPipeDO.getSecurityMan());
-                        result.put("pipeClass",equipPipeDO.getPipeClass());
+//                        result.put("pipeClass",equipPipeDO.getPipeClass());
                         result.put("securityManPhone",equipPipeDO.getSecurityManPhone());
                         result.put("projectName",equipPipeDO.getProjectName());
                         result.put("postalCode",equipPipeDO.getPostalCode());
@@ -162,6 +164,20 @@ public class QC12016_202401JRecordOFData implements IDynamicOFData {
                 // 按/拼接
                 String collect = dictDataRespDTOList.stream().filter(dictDataRespDTO -> pipeCategoryList.contains(dictDataRespDTO.getValue())).map(DictDataRespDTO::getLabel).collect(Collectors.joining("/"));
                 result.put("pipeCategory", collect);
+
+                // 判断pipeLevel是否相同
+                String pipeLevelValue;
+                if (equipPipeDetailDOList != null && !equipPipeDetailDOList.isEmpty()) {
+                    Set<String> pipeLevels = equipPipeDetailDOList.stream()
+                            .map(EquipPipeDetailDO::getPipeLevel)
+                            .filter(Objects::nonNull)
+                            .collect(Collectors.toSet());
+                    // 如果只有一个唯一的pipeLevel值，则使用该值；否则设置为"见一览表"
+                    pipeLevelValue = pipeLevels.size() == 1 ? pipeLevels.iterator().next() : "见一览表";
+                } else {
+                    pipeLevelValue = "";
+                }
+                result.put("pipeLevel", pipeLevelValue);
             }
 
             String orderId = itemReportDO.getOrderId();

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

@@ -123,7 +123,10 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                     }
                     result.put("unitAddress", "见一览表");
                     result.put("pipeClass", "见一览表");
-                    result.put("pipeName1", "见一览表");
+                    result.put("projectNo", "见一览表");
+                    result.put("projectName", "见一览表");
+                    result.put("pipeName", "见一览表");
+                    result.put("layingMode", "见一览表");
                 } else {
                     EquipPipeDO equipPipeDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
                     if (equipPipeDO != null) {
@@ -131,7 +134,7 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                         result.put("unitCode", equipPipeDO.getUnitCode());
                         result.put("unitName", equipPipeDO.getUnitName());
                         result.put("unitAddress", equipPipeDO.getUnitAddress());
-
+                        result.put("projectNo", equipPipeDO.getProjectNo());
                         result.put("contactPhone", equipPipeDO.getContactPhone());
                         result.put("certificateNo", equipPipeDO.getCertificateNo());
 
@@ -150,13 +153,20 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                         result.put("pipeLengthTotal", String.valueOf(sum));
                         result.put("undergroundLength", String.valueOf(sum1));
 
+                        if (equipPipeDetailDOList.size() > 1){
+                            result.put("pipeName","见一览表" );
+                        }else if (equipPipeDetailDOList.size() == 1){
+                            result.put("pipeName", equipPipeDetailDOList.get(0).getPipeName());
+                        }
+
+
                         if (equipPipeDetailDOList.size() > 0) {
                             if (equipPipeDetailDOList.get(0).getDesignLifeYears() != null){
                                 result.put("designLifeYears", String.valueOf(equipPipeDetailDOList.get(0).getDesignLifeYears()));
                             }
-                            if (equipPipeDetailDOList.get(0).getCommissioningDate() != null){
-                                result.put("commissioningDate", String.valueOf(equipPipeDetailDOList.get(0).getCommissioningDate().format(dateFormat)));
-                            }
+//                            if (equipPipeDetailDOList.get(0).getCommissioningDate() != null){
+//                                result.put("commissioningDate", String.valueOf(equipPipeDetailDOList.get(0).getCommissioningDate().format(dateFormat)));
+//                            }
                         }
 
 

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

@@ -98,11 +98,7 @@ public class QC12024_202403ReportOFData implements IDynamicOFData {
             if (!itemDOList.isEmpty()) {
                 //设备信息
                 if (itemDOList.size() > 1) {
-                    result.put("unitCode", "见一览表");
-                    result.put("unitName", "见一览表");
-                    result.put("unitAddress", "见一览表");
-                    result.put("pipeName1", "见一览表");
-                    result.put("pipeClass", "见一览表");
+
                 } else {
                     EquipPipeDO equipPipeDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
                     if (equipPipeDO != null) {