调整

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

@@ -2,9 +2,11 @@ package cn.start.tz.module.pressure2.service.dynamicOFData.pipe;
 
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
+import cn.start.tz.module.pressure2.dal.dataobject.equippipedetail.EquipPipeDetailDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderinput.PipeTaskOrderInputDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitem.PipeTaskOrderItemDO;
+import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemdetail.PipeTaskOrderItemDetailDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreport.PipeTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.mysql.equippipe.EquipPipeMapper;
 import cn.start.tz.module.pressure2.dal.mysql.equippipedetail.EquipPipeDetailMapper;
@@ -14,6 +16,7 @@ import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemdetail.PipeTaskOr
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOrderItemReportMapper;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.JsonConvertUtil;
 import cn.start.tz.module.pressure2.service.dynamictbcol.DynamicTbColService;
 import cn.start.tz.module.pressure2.service.dynamictbval.DynamicTbValService;
 import cn.start.tz.module.pressure2.service.pipetaskorderinput.PipeTaskOrderInputService;
@@ -96,6 +99,14 @@ public class QC12002_202401ReportOFData implements IDynamicOFData {
             List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                     .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
             if (!itemDOList.isEmpty()) {
+
+                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", JsonConvertUtil.formatNumber(sum));
+                }
+
                 //设备信息
                 if (itemDOList.size() > 1) {
                     result.put("projectName", "见一览表");
@@ -112,9 +123,6 @@ public class QC12002_202401ReportOFData implements IDynamicOFData {
                         result.put("testingOrganization", equipPipeDO.getTestingOrganization());
                         result.put("testingOrganizationPermitCode", equipPipeDO.getTestingOrganizationPermitCode());
                         result.put("pipeClass", equipPipeDO.getPipeClass());
-                        if (equipPipeDO.getPipeLengthTotal() != null) {
-                            result.put("pipeLengthTotal", equipPipeDO.getPipeLengthTotal().toString());
-                        }
                         result.put("layingMode", equipPipeDO.getLayingMode());
                         result.put("supervisionStartDate", equipPipeDO.getSupervisionStartDate().format(dateFormat));
                         result.put("supervisionEndDate", equipPipeDO.getSupervisionEndDate().format(dateFormat));

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

@@ -20,6 +20,7 @@ import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataPipeService;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.InspectorInfoPipeUtil;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.JsonConvertUtil;
 import cn.start.tz.module.pressure2.service.dynamictbcol.DynamicTbColService;
 import cn.start.tz.module.pressure2.service.dynamictbval.DynamicTbValService;
 import cn.start.tz.module.pressure2.service.pipetaskorderinput.PipeTaskOrderInputService;
@@ -123,7 +124,7 @@ public class QC12016_202401JRecordOFData implements IDynamicOFData {
                 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));
+                    result.put("pipeLengthTotal", JsonConvertUtil.formatNumber(sum));
                 }
                 //获取约检管线
                 if (!allDetailDOS.isEmpty()){

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

@@ -20,6 +20,7 @@ import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemdetail.PipeTaskOr
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOrderItemReportMapper;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.JsonConvertUtil;
 import cn.start.tz.module.pressure2.service.dynamictbcol.DynamicTbColService;
 import cn.start.tz.module.pressure2.service.dynamictbval.DynamicTbValService;
 import cn.start.tz.module.pressure2.service.pipetaskorderinput.PipeTaskOrderInputService;
@@ -106,10 +107,15 @@ public class QC12024_202400ReportOFData implements IDynamicOFData {
             if (!itemDOList.isEmpty()){
                 //设备信息
                 EquipPipeDO equipPipeDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
+
+                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", JsonConvertUtil.formatNumber(sum));
+                }
+
                 if (itemDOList.size() > 1){
-//                    result.put("unitCode","见一览表");
-//                    result.put("unitName","见一览表");
-//                    result.put("unitAddress","见一览表");
 
                     if (equipPipeDO != null){
                         result.put("unitCode",equipPipeDO.getUnitCode());
@@ -120,48 +126,7 @@ public class QC12024_202400ReportOFData implements IDynamicOFData {
                     //获取所有管道信息
                     List<EquipPipeDO> equipPipeDOList = equipPipeMapper.selectList(new LambdaQueryWrapper<EquipPipeDO>()
                             .in(EquipPipeDO::getId, itemDOList.stream().map(PipeTaskOrderItemDO::getEquipId).toList()));
-                    
-                    //分别检查管道类别和使用登记证编号是否一致
-                   /* if (!equipPipeDOList.isEmpty()) {
-                        // 检查所有管道的类别是否一致
-                        String firstPipeCategory = equipPipeDOList.get(0).getPipeCategory();
-                        boolean allPipeCategorySame = true;
-                        for (int i = 1; i < equipPipeDOList.size(); i++) {
-                            EquipPipeDO pipeDO = equipPipeDOList.get(i);
-                            if (firstPipeCategory == null ? pipeDO.getPipeCategory() != null : !firstPipeCategory.equals(pipeDO.getPipeCategory())) {
-                                allPipeCategorySame = false;
-                                break;
-                            }
-                        }
-                        
-                        // 检查所有管道的使用登记证编号是否一致
-                        String firstCertificateNo = equipPipeDOList.get(0).getCertificateNo();
-                        boolean allCertificateNoSame = true;
-                        for (int i = 1; i < equipPipeDOList.size(); i++) {
-                            EquipPipeDO pipeDO = equipPipeDOList.get(i);
-                            if (firstCertificateNo == null ? pipeDO.getCertificateNo() != null : !firstCertificateNo.equals(pipeDO.getCertificateNo())) {
-                                allCertificateNoSame = false;
-                                break;
-                            }
-                        }
-                        
-                        // 根据比较结果设置值
-                        if (allPipeCategorySame) {
-                            DictDataRespDTO dictDataRespDTO = dictDataApi.getDictData("PIPE_TYPE",firstPipeCategory).getData();
-                            if (dictDataRespDTO != null){
-                                result.put("pipeCategory",dictDataRespDTO.getLabel());
-                            }
-                            //result.put("pipeCategory", firstPipeCategory);
-                        } else {
-                            result.put("pipeCategory", "见一览表");
-                        }
-                        
-                        if (allCertificateNoSame) {
-                            result.put("certificateNo", firstCertificateNo);
-                        } else {
-                            result.put("certificateNo", "见一览表");
-                        }
-                    }*/
+
                     if (!equipPipeDOList.isEmpty()) {
                         // 查询是否已经填写管道类别
                         try {
@@ -212,15 +177,7 @@ public class QC12024_202400ReportOFData implements IDynamicOFData {
                         }
                     }
                 }
-                if (equipPipeDO != null) {
-                    result.put("certificateNo",equipPipeDO.getCertificateNo());
-                    // 管道长度相加
-                    // 获取所有管道信息
-                    List<PipeTaskOrderItemDetailDO> pipeTaskOrderItemDetailDOS = pipeTaskOrderItemDetailMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDetailDO>().in(PipeTaskOrderItemDetailDO::getOrderItemId, itemDOList.stream().map(PipeTaskOrderItemDO::getId).toList()));
-                    List<EquipPipeDetailDO> equipPipeDetailDOList = equipPipeDetailMapper.selectList(new LambdaQueryWrapper<EquipPipeDetailDO>().in(EquipPipeDetailDO::getId, pipeTaskOrderItemDetailDOS.stream().map(PipeTaskOrderItemDetailDO::getEquipDetailId).toList()));
-                    double sum = equipPipeDetailDOList.stream().mapToDouble(equipPipeDetailDO -> equipPipeDetailDO.getPipeLength().doubleValue()).sum();
-                    result.put("pipeLengthTotal", String.valueOf(sum));
-                }
+
             }
             String orderId = itemReportDO.getOrderId();
             PipeTaskOrderDO taskOrderDO = pipeTaskOrderMapper.selectById(orderId);

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

@@ -18,10 +18,7 @@ import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemdetail.PipeTaskOr
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOrderItemReportMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderuser.PipeTaskOrderUserMapper;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
-import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataPipeService;
-import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
-import cn.start.tz.module.pressure2.service.dynamicOFData.util.InspectorInfoPipeUtil;
-import cn.start.tz.module.pressure2.service.dynamicOFData.util.InspectorInfoUtil;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.*;
 import cn.start.tz.module.pressure2.service.dynamictbcol.DynamicTbColService;
 import cn.start.tz.module.pressure2.service.dynamictbval.DynamicTbValService;
 import cn.start.tz.module.pressure2.service.pipetaskorderinput.PipeTaskOrderInputService;
@@ -138,8 +135,8 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                     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", formatNumber(sum));
-                    result.put("undergroundLength", formatNumber(sum1));
+                    result.put("pipeLengthTotal", JsonConvertUtil.formatNumber(sum));
+                    result.put("undergroundLength", JsonConvertUtil.formatNumber(sum1));
                 }
 
                 //获取约检管线
@@ -229,16 +226,4 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
         return result;
     }
 
-    /**
-     * 格式化数字：小数为0时显示整数，否则保留1位小数
-     * @param value 需要格式化的数值
-     * @return 格式化后的字符串
-     */
-    private String formatNumber(double value) {
-        if (value == (long) value) {
-            return String.valueOf((long) value);
-        } else {
-            return String.format("%.1f", value);
-        }
-    }
 }

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

@@ -106,15 +106,9 @@ public class QC12113_202401RecordOFData implements IDynamicOFData {
 
                     result.put("pipeLevel", pipeDO.getPipeClass());
                     result.put("designPressure", detailDO.getDesignPressure());
-                    if (pipeDO.getPipeLengthTotal() != null) {
-                        result.put("pipeLengthTotal", pipeDO.getPipeLengthTotal().toString());
-                    }
                     result.put("pipeMedium", detailDO.getPipeMedium());
                     result.put("designLifeYears", detailDO.getDesignLifeYears());
                     result.put("layingMode", pipeDO.getLayingMode());
-                    if (detailDO.getUndergroundLength() != null) {
-                        result.put("undergroundLength", detailDO.getUndergroundLength().toString());
-                    }
                     if (detailDO.getConstructionStartDate() != null) {
                         result.put("constructionStartDate", detailDO.getConstructionStartDate().format(dateFormat));
                     }

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

@@ -15,6 +15,7 @@ import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemdetail.PipeTaskOr
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOrderItemReportMapper;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataPipeService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.JsonConvertUtil;
 import cn.start.tz.module.pressure2.service.dynamictbcol.DynamicTbColService;
 import cn.start.tz.module.pressure2.service.dynamictbval.DynamicTbValService;
 import cn.start.tz.module.pressure2.service.pipetaskorderitemdetail.PipeTaskOrderItemDetailService;
@@ -103,8 +104,8 @@ public class QC12123_202402RecordOFData implements IDynamicOFData {
                     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).sum();
                     double sum1 = equipPipeDetailDOList.stream().mapToDouble(equipPipeDetailDO -> equipPipeDetailDO.getUndergroundLength() != null ? equipPipeDetailDO.getUndergroundLength().doubleValue() : 0).sum();
-                    result.put("pipeLengthTotal", String.valueOf(sum));
-                    result.put("undergroundLength", String.valueOf(sum1));
+                    result.put("pipeLengthTotal", JsonConvertUtil.formatNumber(sum));
+                    result.put("undergroundLength", JsonConvertUtil.formatNumber(sum1));
 
                     if (allDetailDOS.size() == 1) {
                         EquipPipeDetailDO equipPipeDetailDO = equipPipeDetailDOList.get(0);

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

@@ -169,7 +169,7 @@ public class QC12171_202401RecordOFData implements IDynamicOFData {
                     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));
+                        result.put("pipeLengthTotal", JsonConvertUtil.formatNumber(sum));
                     }
                     //获取约检管线
                     if (!allDetailDOS.isEmpty()){

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

@@ -13,6 +13,7 @@ import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemdetail.PipeTaskOr
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOrderItemReportMapper;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataPipeService;
+import cn.start.tz.module.pressure2.service.dynamicOFData.util.JsonConvertUtil;
 import cn.start.tz.module.pressure2.service.dynamictbcol.DynamicTbColService;
 import cn.start.tz.module.pressure2.service.dynamictbval.DynamicTbValService;
 import cn.start.tz.module.system.api.user.AdminUserApi;
@@ -87,7 +88,7 @@ public class QC12184_202401JRecordOFData implements IDynamicOFData {
             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));
+                result.put("pipeLengthTotal", JsonConvertUtil.formatNumber(sum));
             }
 
             if (!itemDOList.isEmpty()){

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/util/JsonConvertUtil.java

@@ -161,4 +161,17 @@ public class JsonConvertUtil {
 
         jsonObject.put(fieldName, formattedValue);
     }
+
+    /**
+     * 格式化数字：小数为0时显示整数，否则保留1位小数
+     * @param value 需要格式化的数值
+     * @return 格式化后的字符串
+     */
+    public static String formatNumber(double value) {
+        if (value == (long) value) {
+            return String.valueOf((long) value);
+        } else {
+            return String.format("%.1f", value);
+        }
+    }
 }