安全检查计划状态查询

zlmy-modules/zlmy-boot/doc/v2.6.0/修改记录.md

@@ -244,3 +244,8 @@ where config_id = '1'
 # t_hazard_work_plan 的 license_check_user 修改成 text
 ALTER TABLE t_hazard_work_plan
 ALTER COLUMN license_check_user TYPE TEXT;
+
+
+# 20250815上线需更改
+ALTER TABLE public.t_safe_check_plan ALTER COLUMN start_date TYPE timestamp USING start_date::timestamp;
+ALTER TABLE public.t_safe_check_plan ALTER COLUMN end_date TYPE timestamp USING start_date::timestamp;

zlmy-modules/zlmy-boot/src/main/java/com/testor/common/util/DateUtil.java

@@ -3,6 +3,7 @@ package com.testor.common.util;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
+import org.apache.poi.ss.formula.functions.Now;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -852,7 +853,8 @@ public class DateUtil {
     }
 
     public static void main(String[] args) {
-        System.out.println(getTodayStartString());
+        LocalDateTime startDate = com.testor.common.util.DateUtil.dateToLocalDateTime( new Date());
+        System.out.println(startDate);
     }
 
 }

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/safeCheck/controller/TSafeCheckPlanController.java

@@ -262,8 +262,10 @@ public class TSafeCheckPlanController extends SuperController
 				queryWrapper.gt(TSafeCheckPlan.START_DATE, now);
 			//进行中
 			}else if (queryParam.getPlanStatus().equals("1")){
-				queryWrapper.le(TSafeCheckPlan.START_DATE, now)
-						.ge(TSafeCheckPlan.START_DATE, now);
+				/*queryWrapper.le(TSafeCheckPlan.START_DATE, now)
+						.ge(TSafeCheckPlan.START_DATE, now);*/
+				queryWrapper.le(TSafeCheckPlan.START_DATE, now)   // 已经开始
+						.ge(TSafeCheckPlan.END_DATE, now);     // 尚未结束
 			//未开始
 			}else if (queryParam.getPlanStatus().equals("2")){
 				queryWrapper.lt(TSafeCheckPlan.START_DATE, now);