管道 记录报告

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

@@ -106,6 +106,7 @@ public class QC12016_202401JRecordOFData implements IDynamicOFData {
                     result.put("unitCode","见一览表");
                     result.put("unitName","见一览表");
                     result.put("unitAddress","见一览表");
+                    result.put("pipeClass", "见一览表");
                 }else {
                     if (equipPipeDO != null){
                         result.put("unitCode",equipPipeDO.getUnitCode());
@@ -136,9 +137,14 @@ public class QC12016_202401JRecordOFData implements IDynamicOFData {
                         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());
+//                            EquipPipeDetailDO detailDO = equipPipeDetailMapper.selectById(detailDOS.get(0).getEquipDetailId());
+//                            if (detailDO != null){
+//                                result.put("pipeName1",detailDO.getPipeName());
+//                            }
+
+                            //调整成多条默认"见一览表"
+                            if (detailDOS.size() > 1) {
+                                result.put("pipeName1", "见一览表");
                             }
                         }
                     }

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

@@ -101,10 +101,13 @@ public class QC12016_202401ReportOFData implements IDynamicOFData {
             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){
 
@@ -126,6 +129,13 @@ public class QC12016_202401ReportOFData implements IDynamicOFData {
                 // 按/拼接
                 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().doubleValue()).sum();
+                double sum1 = equipPipeDetailDOList.stream().mapToDouble(equipPipeDetailDO -> equipPipeDetailDO.getUndergroundLength().doubleValue()).sum();
+                result.put("pipeLengthTotal", String.valueOf(sum));
+                result.put("undergroundLength", String.valueOf(sum1));
             }
 
             String orderId = itemReportDO.getOrderId();
@@ -137,6 +147,8 @@ public class QC12016_202401ReportOFData implements IDynamicOFData {
                     checkDateStr += " 至 " + orderInputDO.getEndCheckDate().format(dateFormat);
                 }
                 result.put("checkDateEnd",checkDateStr);
+                result.put("checkDate1",taskOrderDO.getCheckDate().format(dateFormat));
+                result.put("checkDate2",orderInputDO.getEndCheckDate().format(dateFormat));
             }
 
             result.put("reportNo",itemReportDO.getReportNo());

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12024_202403JRecordOFData.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;
@@ -93,14 +95,28 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
             List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                     .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
             if (!itemDOList.isEmpty()) {
+                PipeTaskOrderDO taskOrderDO = pipeTaskOrderMapper.selectById(itemReportDO.getOrderId());
+                if (taskOrderDO != null){
+                    String checkDateStr = taskOrderDO.getCheckDate().format(dateFormat);
+                    PipeTaskOrderInputDO orderInputDO = pipeTaskOrderInputService.lambdaQuery().eq(PipeTaskOrderInputDO::getOrderId, itemReportDO.getOrderId()).one();
+                    if (orderInputDO != null && orderInputDO.getEndCheckDate() != null){
+                        checkDateStr += " 至 " + orderInputDO.getEndCheckDate().format(dateFormat);
+                    }
+                    result.put("checkDateEnd",checkDateStr);
+                    result.put("checkDate1",taskOrderDO.getCheckDate().format(dateFormat));
+                    result.put("checkDate2",orderInputDO.getEndCheckDate().format(dateFormat));
+                }
                 //设备信息
                 if (itemDOList.size() > 1) {
                     result.put("unitCode", "见一览表");
                     result.put("unitName", "见一览表");
                     result.put("unitAddress", "见一览表");
+                    result.put("pipeClass", "见一览表");
+                    result.put("pipeName1", "见一览表");
                 } 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());
@@ -115,7 +131,20 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                         result.put("postalCode", equipPipeDO.getPostalCode());
                         result.put("pipeUsePlace", equipPipeDO.getPipeUsePlace());
 
-                        result.put("pipeLengthTotal", equipPipeDO.getPipeLengthTotal().toString());
+
+                        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();
+                        double sum1 = equipPipeDetailDOList.stream().mapToDouble(equipPipeDetailDO -> equipPipeDetailDO.getUndergroundLength().doubleValue()).sum();
+                        result.put("pipeLengthTotal", String.valueOf(sum));
+                        result.put("undergroundLength", String.valueOf(sum1));
+
+                        if (equipPipeDetailDOList.size() > 0) {
+                            result.put("designLifeYears", String.valueOf(equipPipeDetailDOList.get(0).getDesignLifeYears()));
+                            result.put("commissioningDate", String.valueOf(equipPipeDetailDOList.get(0).getCommissioningDate().format(dateFormat)));
+                        }
+
+
 
 //                        DictDataRespDTO dictDataRespDTO = dictDataApi.getDictData("PIPE_TYPE", equipPipeDO.getPipeCategory()).getData();
 //                        if (dictDataRespDTO != null) {

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

@@ -101,6 +101,8 @@ public class QC12024_202403ReportOFData implements IDynamicOFData {
                     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) {