危险作业确认排除已超时的数据

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardConditionConfirmationServiceImpl.java

@@ -140,7 +140,7 @@ public class THazardConditionConfirmationServiceImpl extends SuperServiceImpl<TH
         if (StringUtils.isBlank(todayStr)) {
             todayStr = today.format(DateTimeFormatter.ISO_DATE);
         }
-        //查询所有未完成的工作计划,且状态不为关闭或取消
+        //查询所有未完成的工作计划,且状态不为关闭或取消或已超时(关闭时判断结束时间在当前时间之前设置的状态)
         THazardWorkPlanParam tHazardWorkPlanParam = new THazardWorkPlanParam();
         tHazardWorkPlanParam.setActualStartTime(new Date());
         QueryWrapper<THazardWorkPlan> query = new QueryWrapper<>();
@@ -148,6 +148,7 @@ public class THazardConditionConfirmationServiceImpl extends SuperServiceImpl<TH
         query.isNotNull(THazardWorkPlan.ACTUAL_START_TIME);
         query.ne(THazardWorkPlan.WORK_STATUS, WorkPlanStatusEnum.CLOSED.getValue());
         query.ne(THazardWorkPlan.WORK_STATUS, WorkPlanStatusEnum.CANCELED.getValue());
+        query.ne(THazardWorkPlan.WORK_STATUS, WorkPlanStatusEnum.OVERDUE.getValue());
         List<THazardWorkPlan> tHazardWorkPlans = tHazardWorkPlanService.list(query);
         for (THazardWorkPlan tHazardWorkPlan : tHazardWorkPlans) {
             List<THazardConditionConfirmationRecord> tHazardConditionConfirmations = tHazardConditionConfirmationRecordService.list(new QueryWrapper<THazardConditionConfirmationRecord>()