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 0) { - List list1 = list.stream().filter(l -> DateUtil.compare(DateUtil.parseDate(l.getPlanEndTime()), DateUtil.beginOfMonth(date), "yyyy-MM-dd") >= 0 + List 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) {