报表调整

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

@@ -119,7 +119,7 @@ public class QC12024_202403JRecordOFData 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/QC12024_202403ReportOFData.java

@@ -112,6 +112,20 @@ public class QC12024_202403ReportOFData implements IDynamicOFData {
                 }
             }
 
+            if (result.get("pipeType1") != null){
+                if (result.get("pipeType1").equals("true")){
+                    result.put("pipeTypeReport", "工业管道");
+                }else if (result.get("pipeType1").equals("false")){
+                    result.put("pipeTypeReport", "");
+                }
+            }else if (result.get("pipeType2") != null){
+                if (result.get("pipeType2").equals("true")){
+                    result.put("pipeTypeReport", "公用管道");
+                }else if (result.get("pipeType2").equals("false")){
+                    result.put("pipeTypeReport", "");
+                }
+            }
+
             String orderId = itemReportDO.getOrderId();
             PipeTaskOrderDO taskOrderDO = pipeTaskOrderMapper.selectById(orderId);
             if (taskOrderDO != null) {
@@ -124,6 +138,9 @@ public class QC12024_202403ReportOFData implements IDynamicOFData {
                 result.put("checkDateEnd", checkDateStr);
             }
 
+            //二维码
+            result.put("qrCode", itemReportDO.getQrCodeUrl());
+
             result.put("reportNo", itemReportDO.getReportNo());
 
             //审核人员信息

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

@@ -8,6 +8,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitem.PipeTaskOrd
 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;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorder.PipeTaskOrderMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitem.PipeTaskOrderItemMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemdetail.PipeTaskOrderItemDetailMapper;
@@ -28,6 +29,8 @@ import java.math.BigDecimal;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 压力管道资料审查记录
@@ -48,6 +51,12 @@ public class QC12123_202402RecordOFData implements IDynamicOFData {
     @Resource
     private PipeTaskOrderItemDetailService pipeTaskOrderItemDetailService;
 
+    @Resource
+    private PipeTaskOrderItemDetailMapper pipeTaskOrderItemDetailMapper;
+
+    @Resource
+    private EquipPipeDetailMapper equipPipeDetailMapper;
+
     @Resource
     private PipeTaskOrderMapper pipeTaskOrderMapper;
 
@@ -87,28 +96,36 @@ public class QC12123_202402RecordOFData implements IDynamicOFData {
             List<PipeTaskOrderItemDO> itemDOList = pipeTaskOrderItemMapper.selectList(new LambdaQueryWrapper<PipeTaskOrderItemDO>()
                     .eq(PipeTaskOrderItemDO::getOrderId, itemReportDO.getOrderId()));
             if (!itemDOList.isEmpty()) {
-                //设备信息
-                // 总长度（米）pipeLengthTotal
-                List<EquipPipeDetailDO> equipPipeDetailDOS = pipeTaskOrderItemDetailService.getPipeTaskOrderItemDetailList(itemDOList.get(0).getOrderId());
-                result.put("pipeLengthTotal", equipPipeDetailDOS.stream()
-                        .map(EquipPipeDetailDO::getPipeLength)
-                        .filter(Objects::nonNull)
-                        .reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue());
-
-                if (equipPipeDetailDOS.size() == 1) {
-                    EquipPipeDetailDO equipPipeDetailDO = equipPipeDetailDOS.get(0);
-                    result.put("undergroundLength", equipPipeDetailDO.getUndergroundLength());
-                    //设计使用年限designLifeYears
-                    result.put("designLifeYears", equipPipeDetailDO.getDesignLifeYears());
-                    //投入使用日期commissioningDate
-                    result.put("commissioningDate", equipPipeDetailDO.getCommissioningDate());
+                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 (allDetailDOS.size() == 1) {
+                        EquipPipeDetailDO equipPipeDetailDO = equipPipeDetailDOList.get(0);
+                        //设计使用年限designLifeYears
+                        result.put("designLifeYears", equipPipeDetailDO.getDesignLifeYears());
+                        //投入使用日期commissioningDate
+                        result.put("commissioningDate", equipPipeDetailDO.getCommissioningDate());
+                    }else {
+                        result.put("designLifeYears", "见一览表");
+                        result.put("commissioningDate", "见一览表");
+                    }
                 }
+
+                //设备信息
                 if (itemDOList.size() > 1) {
                     result.put("projectNo", "见一览表");
                     result.put("projectName", "见一览表");
                     result.put("designUnit", "见一览表");
                     result.put("constructionUnit", "见一览表");
-                    result.put("installCheckReportNo", "见一览表");
+                    result.put("lastMaintenanceReportNo", "见一览表");
+                    result.put("layingMode", "见一览表");
+                    result.put("lastLegalPeriodicalInspectionReportNo", "见一览表");
+                    result.put("lastYearReportNo", "见一览表");
                 } else {
                     EquipPipeDO equipPipeDO = equipPipeMapper.selectById(itemDOList.get(0).getEquipId());
                     if (equipPipeDO != null) {
@@ -116,26 +133,14 @@ public class QC12123_202402RecordOFData implements IDynamicOFData {
                         result.put("projectName", equipPipeDO.getProjectName());
                         result.put("designUnit", equipPipeDO.getDesignUnit());
                         result.put("constructionUnit", equipPipeDO.getConstructionUnit());
-                        result.put("installCheckReportNo", equipPipeDO.getInstallCheckReportNo());
-
-//                        result.put("pipeClass",equipPipeDO.getPipeClass());
-
+                        result.put("lastMaintenanceReportNo", equipPipeDO.getLastMaintenanceReportNo());
                         //管道敷设方式layingMode
                         result.put("layingMode", equipPipeDO.getLayingMode());
                         //埋地长度（米）undergroundLength
-
-                        if (equipPipeDO.getLastLegalPeriodicalInspectionReportNo() == null) {
-                            result.put("lastLegalPeriodicalInspectionReportNo", "-");
-                        } else {
-                            result.put("lastLegalPeriodicalInspectionReportNo", equipPipeDO.getLastLegalPeriodicalInspectionReportNo());
-                        }
-
-                        if (equipPipeDO.getLastYearReportNo() == null) {
-                            result.put("lastYearReportNo", "-");
-                        } else {
-                            result.put("lastYearReportNo", equipPipeDO.getLastYearReportNo());
-                        }
+                        result.put("lastLegalPeriodicalInspectionReportNo", equipPipeDO.getLastLegalPeriodicalInspectionReportNo());
+                        result.put("lastYearReportNo", equipPipeDO.getLastYearReportNo());
                     }
+
                 }
             }