报表调整

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

@@ -102,82 +102,62 @@ public class QC12016_202401JRecordOFData implements IDynamicOFData {
             List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                     .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
             if (!itemDOList.isEmpty()){
-                //设备信息
+
                 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("pipeUsePlace", equipPipeDO.getPipeUsePlace());
+                }
+
+                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.size() > 1){
-                    result.put("unitCode","见一览表");
-                    result.put("unitName","见一览表");
-                    result.put("unitAddress","见一览表");
                     result.put("pipeLevel", "见一览表");
+                    result.put("projectNo", "见一览表");
+                    result.put("projectName", "见一览表");
+                    result.put("pipeName", "见一览表");
                 }else {
                     if (equipPipeDO != null){
-                        result.put("unitCode",equipPipeDO.getUnitCode());
-                        result.put("unitName",equipPipeDO.getUnitName());
-                        result.put("unitAddress",equipPipeDO.getUnitAddress());
-
-                        result.put("contactPhone",equipPipeDO.getContactPhone());
-                        result.put("certificateNo",equipPipeDO.getCertificateNo());
-
-                        result.put("securityMan",equipPipeDO.getSecurityMan());
-//                        result.put("pipeClass",equipPipeDO.getPipeClass());
-                        result.put("securityManPhone",equipPipeDO.getSecurityManPhone());
-                        result.put("projectName",equipPipeDO.getProjectName());
-                        result.put("postalCode",equipPipeDO.getPostalCode());
-                        result.put("pipeUsePlace",equipPipeDO.getPipeUsePlace());
-
-                        result.put("installationStatusReg",equipPipeDO.getInstallationStatusReg());
-
-                        result.put("pipeLengthTotal",equipPipeDO.getPipeLengthTotal().toString());
-                        if (equipPipeDO.getNextYearCheckDate() != null){
-                            result.put("nextYearCheckDate",equipPipeDO.getNextYearCheckDate()
-                                    .plusYears(1)
-                                    .minusDays(1)
-                                    .format(dateFormat));
-                        }
+                        result.put("projectNo", equipPipeDO.getProjectNo());
+                        result.put("projectName", equipPipeDO.getProjectName());
 
                         //获取约检管线
                         List<PipeTaskOrderItemDetailDO> detailDOS = pipeTaskOrderItemDetailMapper.selectList(PipeTaskOrderItemDetailDO::getOrderId, itemReportDO.getOrderId());
                         if (!detailDOS.isEmpty()){
 
-                            //调整成多条默认"见一览表"
-                            if (detailDOS.size() > 1) {
-                                result.put("pipeName1", "见一览表");
-                            }else{
-                                EquipPipeDetailDO detailDO = equipPipeDetailMapper.selectById(detailDOS.get(0).getEquipDetailId());
-                                if (detailDO != null){
-                                    result.put("pipeName1",detailDO.getPipeName());
-                                }
+                            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()) {
+                                // 判断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 (equipPipeDO != null) {
-                    result.put("certificateNo", equipPipeDO.getCertificateNo());
-                }
-                List<EquipPipeDO> equipPipeDOList = equipPipeMapper.selectList(new LambdaQueryWrapper<EquipPipeDO>().in(EquipPipeDO::getId, itemDOList.stream().map(PipeTaskOrderItemDO::getEquipId).toList()));
-                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().doubleValue()).sum();
-                result.put("pipeLengthTotal", String.valueOf(sum));
-                List<String> pipeCategoryList = equipPipeDOList.stream().map(EquipPipeDO::getPipeCategory).distinct().toList();
-                List<DictDataRespDTO> dictDataRespDTOList = dictDataApi.getDictDataList("PIPE_TYPE").getData();
-                // 按/拼接
-                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/QC12016_202401ReportOFData.java

@@ -100,42 +100,16 @@ public class QC12016_202401ReportOFData implements IDynamicOFData {
                     .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
             if (!itemDOList.isEmpty()){
                 //设备信息
-                EquipPipeDO equipPipeDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
-                result.put("layingMode", equipPipeDO.getLayingMode());
-                if (itemDOList.size() > 1){
-                    result.put("unitCode","见一览表");
-                    result.put("unitName","见一览表");
-                    result.put("unitAddress","见一览表");
-                    result.put("pipeClass", "见一览表");
-                    result.put("pipeName1", "见一览表");
-                }else {
-                    if (equipPipeDO != null){
-
-                        //获取约检管线
-//                        List<PipeTaskOrderItemDetailDO> detailDOS = pipeTaskOrderItemDetailMapper.selectList(PipeTaskOrderItemDetailDO::getOrderId, itemReportDO.getOrderId());
-//                        if (!detailDOS.isEmpty()){
-//                            //获取任意一条管线
-//                            EquipPipeDetailDO detailDO = equipPipeDetailMapper.selectById(detailDOS.get(0).getEquipDetailId());
-//                            if (detailDO != null){
-//                                result.put("pipeName1",detailDO.getPipeName());
-//                            }
-//                        }
+
+                List<EquipPipeDO> equipPipeDOList = equipPipeMapper.selectList(new LambdaQueryWrapper<EquipPipeDO>().in(EquipPipeDO::getId, itemDOList.stream().map(PipeTaskOrderItemDO::getEquipId).toList()));
+                if (!equipPipeDOList.isEmpty()){
+                    EquipPipeDO equipPipeDO = equipPipeDOList.get(0);
+                    DictDataRespDTO dictDataRespDTO = dictDataApi.getDictData("PIPE_TYPE",equipPipeDO.getPipeCategory()).getData();
+                    if (dictDataRespDTO != null){
+                        result.put("pipeCategory", dictDataRespDTO.getLabel());
                     }
                 }
 
-                List<EquipPipeDO> equipPipeDOList = equipPipeMapper.selectList(new LambdaQueryWrapper<EquipPipeDO>().in(EquipPipeDO::getId, itemDOList.stream().map(PipeTaskOrderItemDO::getEquipId).toList()));
-                List<String> pipeCategoryList = equipPipeDOList.stream().map(EquipPipeDO::getPipeCategory).distinct().toList();
-                List<DictDataRespDTO> dictDataRespDTOList = dictDataApi.getDictDataList("PIPE_TYPE").getData();
-                // 按/拼接
-                String collect = dictDataRespDTOList.stream().filter(dictDataRespDTO -> pipeCategoryList.contains(dictDataRespDTO.getValue())).map(DictDataRespDTO::getLabel).collect(Collectors.joining("/"));
-                result.put("pipeCategory", collect);
-
-                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));
             }
 
             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

@@ -115,98 +115,66 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                         result.put("checkDate1", taskOrderDO.getCheckDate().format(dateFormat));
                     }
                 }
+                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("pipeUsePlace", equipPipeDO.getPipeUsePlace());
+                }
+
+                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();
+                    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 (itemDOList.size() > 1) {
-                    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("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) {
-                        result.put("layingMode", equipPipeDO.getLayingMode());
-                        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());
-
-                        result.put("securityMan", equipPipeDO.getSecurityMan());
-                        result.put("pipeClass", equipPipeDO.getPipeClass());
-                        result.put("securityManPhone", equipPipeDO.getSecurityManPhone());
-                        result.put("projectName", equipPipeDO.getProjectName());
-                        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::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());
-                            }
+                    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()) {
-                                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);
+                        if (!equipPipeDetailDOList.isEmpty()) {
+                            if (equipPipeDetailDOList.get(0).getDesignLifeYears() != null){
+                                result.put("designLifeYears", String.valueOf(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);
                         }
-
-//                        DictDataRespDTO dictDataRespDTO = dictDataApi.getDictData("PIPE_TYPE", equipPipeDO.getPipeCategory()).getData();
-//                        if (dictDataRespDTO != null) {
-//                            result.put("pipeCategory", dictDataRespDTO.getLabel());
-//                        }
                     }
                 }
 
-                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());