管线埋线长度空按0统计

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

@@ -132,8 +132,8 @@ public class QC12016_202401ReportOFData implements IDynamicOFData {
 
                 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();
+                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));
             }
@@ -147,8 +147,12 @@ 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));
+                if (taskOrderDO.getCheckDate() != null) {
+                    result.put("checkDate1", taskOrderDO.getCheckDate().format(dateFormat));
+                }
+                if (orderInputDO.getEndCheckDate() != null) {
+                    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

@@ -103,8 +103,12 @@ public class QC12024_202403JRecordOFData 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));
+                    if (taskOrderDO.getCheckDate() != null) {
+                        result.put("checkDate1", taskOrderDO.getCheckDate().format(dateFormat));
+                    }
+                    if (orderInputDO.getEndCheckDate() != null) {
+                        result.put("checkDate2", orderInputDO.getEndCheckDate().format(dateFormat));
+                    }
                 }
                 //设备信息
                 if (itemDOList.size() > 1) {
@@ -134,8 +138,8 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
 
                         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();
+                        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));