报表调整

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

@@ -117,19 +117,24 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                 }
                 //设备信息
                 if (itemDOList.size() > 1) {
-//                    result.put("unitCode", "见一览表");
-//                    result.put("unitName", "见一览表");
                     EquipPipeDO equipPipeDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
                     if (equipPipeDO != null) {
                         result.put("unitCode", equipPipeDO.getUnitCode());
                         result.put("unitName", equipPipeDO.getUnitName());
+                        result.put("unitAddress", equipPipeDO.getUnitName());
+                        result.put("postalCode", equipPipeDO.getPostalCode());
+                        result.put("certificateNo", equipPipeDO.getCertificateNo());
                     }
-                    result.put("unitAddress", "见一览表");
                     result.put("pipeLevel", "见一览表");
                     result.put("projectNo", "见一览表");
                     result.put("projectName", "见一览表");
                     result.put("pipeName", "见一览表");
                     result.put("layingMode", "见一览表");
+                    result.put("pipeLengthTotal", "见一览表");
+                    result.put("undergroundLength", "见一览表");
+                    result.put("designLifeYears", "见一览表");
+                    result.put("nextYearCheckDate", "见一览表");
+                    result.put("nextLegalCheckDate", "见一览表");
                 } else {
                     EquipPipeDO equipPipeDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
                     if (equipPipeDO != null) {
@@ -148,37 +153,42 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                         result.put("postalCode", equipPipeDO.getPostalCode());
                         result.put("pipeUsePlace", equipPipeDO.getPipeUsePlace());
 
+//                        if (equipPipeDO.getNextYearCheckDate() != null){
+//                            result.put("nextYearCheckDate", equipPipeDO.getNextYearCheckDate().format(dateFormat));
+//                        }
+//                        if (equipPipeDO.getNextLegalCheckDate() != null){
+//                            result.put("nextLegalCheckDate", equipPipeDO.getNextLegalCheckDate().format(dateFormat));
+//                        }
 
-                        List<PipeTaskOrderItemDetailDO> detailDOS = pipeTaskOrderItemDetailMapper.selectList(PipeTaskOrderItemDetailDO::getOrderId, itemReportDO.getOrderId());
-                        List<EquipPipeDetailDO> equipPipeDetailDOList = equipPipeDetailMapper.selectList(new LambdaQueryWrapper<EquipPipeDetailDO>().in(EquipPipeDetailDO::getId, detailDOS.stream().map(PipeTaskOrderItemDetailDO::getEquipDetailId).toList()));
-                        double sum = equipPipeDetailDOList.stream().mapToDouble(equipPipeDetailDO -> equipPipeDetailDO.getPipeLength() != null ? equipPipeDetailDO.getPipeLength().doubleValue() : 0.0).sum();
-                        double sum1 = equipPipeDetailDOList.stream().mapToDouble(equipPipeDetailDO -> equipPipeDetailDO.getUndergroundLength() != null ? equipPipeDetailDO.getUndergroundLength().doubleValue() : 0.0).sum();
-                        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());
-                        }
-
+                        List<PipeTaskOrderItemDetailDO> detailDOS = pipeTaskOrderItemDetailMapper.selectList(PipeTaskOrderItemDetailDO::getOrderItemId, itemDOList.get(0).getId());
+                        if (!detailDOS.isEmpty()){
 
-                        if (!equipPipeDetailDOList.isEmpty()) {
-                            if (equipPipeDetailDOList.get(0).getDesignLifeYears() != null){
-                                result.put("designLifeYears", String.valueOf(equipPipeDetailDOList.get(0).getDesignLifeYears()));
+                            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()) {
+                                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)));
 //                            }
-                            // 判断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);
+                                // 判断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);
+                            }
+
                         }
 
 //                        DictDataRespDTO dictDataRespDTO = dictDataApi.getDictData("PIPE_TYPE", equipPipeDO.getPipeCategory()).getData();
@@ -187,6 +197,16 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
 //                        }
                     }
                 }
+
+                List<PipeTaskOrderItemDetailDO> detailDOS = pipeTaskOrderItemDetailMapper.selectList(PipeTaskOrderItemDetailDO::getOrderId, itemReportDO.getOrderId());
+                if (!detailDOS.isEmpty()){
+                    List<EquipPipeDetailDO> equipPipeDetailDOList = equipPipeDetailMapper.selectList(new LambdaQueryWrapper<EquipPipeDetailDO>().in(EquipPipeDetailDO::getId, detailDOS.stream().map(PipeTaskOrderItemDetailDO::getEquipDetailId).toList()));
+                    double sum = equipPipeDetailDOList.stream().mapToDouble(equipPipeDetailDO -> equipPipeDetailDO.getPipeLength() != null ? equipPipeDetailDO.getPipeLength().doubleValue() : 0.0).sum();
+                    double sum1 = equipPipeDetailDOList.stream().mapToDouble(equipPipeDetailDO -> equipPipeDetailDO.getUndergroundLength() != null ? equipPipeDetailDO.getUndergroundLength().doubleValue() : 0.0).sum();
+                    result.put("pipeLengthTotal", String.valueOf(sum));
+                    result.put("undergroundLength", String.valueOf(sum1));
+                }
+
             }
 
             result.put("reportNo", itemReportDO.getReportNo());

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

@@ -125,10 +125,12 @@ public class QR0413_0415ReportOFData implements IDynamicOFData {
         AtomicInteger number = new AtomicInteger(1);
         equipPipeDOS.forEach(equipPipeDO -> {
 
-            if (equipPipeDO.getPipeCategory().equals("industry_pipe")){
-                isIndustry.set(true);
-            }else if (equipPipeDO.getPipeCategory().equals("public_pipe")){
-                isPublic.set(true);
+            if (equipPipeDO.getPipeCategory() != null){
+                if (equipPipeDO.getPipeCategory().equals("industry_pipe")){
+                    isIndustry.set(true);
+                }else if (equipPipeDO.getPipeCategory().equals("public_pipe")){
+                    isPublic.set(true);
+                }
             }
 
             result.put("value1_" + number.get(), String.valueOf(number.get()));