From a6e4e7c3b24abccec6cda90177769395caf46faa Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Sat, 27 Jul 2024 09:39:49 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DangerousEngineeringRecordServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java
index ffb66c72c..62f39c5ee 100644
--- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java
@@ -228,7 +228,7 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl<Dangerous
         BigDecimal pcfglMax = new BigDecimal(100).multiply(new BigDecimal(0.6)).setScale(2, RoundingMode.HALF_UP);
         BigDecimal pzjlMax = new BigDecimal(100).multiply(new BigDecimal(0.4)).setScale(2, RoundingMode.HALF_UP);
         if (list.size() > 0) {
-            List<DangerousEngineeringRecord> list1 = list.stream().filter(l -> DateUtil.compare(DateUtil.parseDate(l.getPlanEndTime()), DateUtil.beginOfMonth(date), "yyyy-MM-dd") >= 0
+            List<DangerousEngineeringRecord> list1 = list.stream().filter(l -> l.getPlanEndTime() != null && l.getPlanStartTime() != null && DateUtil.compare(DateUtil.parseDate(l.getPlanEndTime()), DateUtil.beginOfMonth(date), "yyyy-MM-dd") >= 0
                     && DateUtil.compare(DateUtil.parseDate(DateUtil.formatDateTime(DateUtil.endOfMonth(date))), DateUtil.parseDate(l.getPlanStartTime()), "yyyy-MM-dd") >= 0).collect(Collectors.toList());
             int totalDay = 0;
             for (DangerousEngineeringRecord dangerousEngineeringRecord : list1) {