调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC47037_202400RecordOFData.java

@@ -171,18 +171,21 @@ public class QC47037_202400RecordOFData implements IDynamicOFData {
 
                 List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                         .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
+
+                EquipPipeDO equipPipeDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+                if (equipPipeDO != null) {
+                    result.put("unitName", equipPipeDO.getUnitName());
+                }
+
                 if (!itemDOList.isEmpty()){
                     //设备信息
                     if (itemDOList.size() > 1){
                         result.put("equipCode","见一览表");
                         result.put("productCode","见一览表");
-                        result.put("unitName","见一览表");
                     }else{
-                        EquipPipeDO equipDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                        if (equipDO != null){
-                            result.put("equipCode",equipDO.getProjectNo());
-                            result.put("productCode",equipDO.getCertificateNo());
-                            result.put("unitName",equipDO.getUnitName());
+                        if (equipPipeDO != null){
+                            result.put("equipCode",equipPipeDO.getProjectNo());
+                            result.put("productCode",equipPipeDO.getCertificateNo());
                         }
                     }
                 }

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

@@ -107,7 +107,7 @@ public class QC12016_202401JRecordOFData implements IDynamicOFData {
                 if (equipPipeDO != null) {
                     result.put("unitCode", equipPipeDO.getUnitCode());
                     result.put("unitName", equipPipeDO.getUnitName());
-                    result.put("unitAddress", equipPipeDO.getUnitName());
+                    result.put("unitAddress", equipPipeDO.getUnitAddress());
                     result.put("postalCode", equipPipeDO.getPostalCode());
                     result.put("certificateNo", equipPipeDO.getCertificateNo());
                     result.put("pipeUsePlace", equipPipeDO.getPipeAddress());

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

@@ -81,49 +81,26 @@ public class QC12184_202401JRecordOFData implements IDynamicOFData {
 
             List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                     .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
+
+            List<PipeTaskOrderItemDetailDO> allDetailDOS = pipeTaskOrderItemDetailMapper.selectList(PipeTaskOrderItemDetailDO::getOrderId, itemReportDO.getOrderId());
+            if (!allDetailDOS.isEmpty()){
+                List<EquipPipeDetailDO> equipPipeDetailDOList = equipPipeDetailMapper.selectList(new LambdaQueryWrapper<EquipPipeDetailDO>().in(EquipPipeDetailDO::getId, allDetailDOS.stream().map(PipeTaskOrderItemDetailDO::getEquipDetailId).toList()));
+                double sum = equipPipeDetailDOList.stream().mapToDouble(equipPipeDetailDO -> equipPipeDetailDO.getPipeLength() != null ? equipPipeDetailDO.getPipeLength().doubleValue() : 0.0).sum();
+                result.put("pipeLengthTotal", String.valueOf(sum));
+            }
+
             if (!itemDOList.isEmpty()){
                 //设备信息
                 if (itemDOList.size() > 1){
                     result.put("projectNo","见一览表");
                     result.put("projectName","见一览表");
                     result.put("pipeClass","见一览表");
-//                    result.put("pipeLengthTotal","见一览表");
-
-                    // 找出全部管道
-                    List<PipeTaskOrderItemDetailDO> pipeTaskOrderItemDetailDOS = pipeTaskOrderItemDetailMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDetailDO>()
-                            .eq(PipeTaskOrderItemDetailDO::getOrderId, itemReportDO.getOrderId()));
-                    Map<String, List<EquipPipeDetailDO>> pipeDetailMap = equipPipeDetailMapper.selectList(
-                                    new LambdaQueryWrapper<EquipPipeDetailDO>().in(EquipPipeDetailDO::getId,
-                                            pipeTaskOrderItemDetailDOS.stream().map(PipeTaskOrderItemDetailDO::getEquipDetailId).collect(Collectors.toList())))
-                            .stream().collect(Collectors.groupingBy(EquipPipeDetailDO::getEquipPipeId));
-                    // 管道总长度相加
-                    double pipeLengthTotal = pipeDetailMap.values().stream()
-                            .flatMap(List::stream)
-                            .map(EquipPipeDetailDO::getPipeLength)
-                            .filter(java.util.Objects::nonNull)
-                            .mapToDouble(BigDecimal::doubleValue)
-                            .sum();
-                    result.put("pipeLengthTotal", String.valueOf(pipeLengthTotal));
-
                 }else {
                     EquipPipeDO equipPipeDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
                     if (equipPipeDO != null){
                         result.put("projectNo",equipPipeDO.getProjectNo());
                         result.put("projectName",equipPipeDO.getProjectName());
                         result.put("pipeClass",equipPipeDO.getPipeClass());
-
-                        List<PipeTaskOrderItemDetailDO> pipeTaskOrderItemDetailDOS = pipeTaskOrderItemDetailMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDetailDO>()
-                                .eq(PipeTaskOrderItemDetailDO::getOrderId, itemReportDO.getOrderId()));
-
-                        List<EquipPipeDetailDO> equipPipeDetailDOS = equipPipeDetailMapper.selectList(new LambdaQueryWrapper<EquipPipeDetailDO>().in(EquipPipeDetailDO::getId, pipeTaskOrderItemDetailDOS.stream()
-                                .map(PipeTaskOrderItemDetailDO::getEquipDetailId).collect(Collectors.toList())));
-                        double pipeLengthTotal = equipPipeDetailDOS.stream()
-                                .map(EquipPipeDetailDO::getPipeLength)
-                                .filter(java.util.Objects::nonNull)
-                                .mapToDouble(BigDecimal::doubleValue)
-                                .sum();
-                        result.put("pipeLengthTotal", String.valueOf(pipeLengthTotal));
-                        //result.put("pipeLengthTotal",equipPipeDO.getPipeLengthTotal().toString());
                     }
                 }
             }