安全应急提醒

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafetyDrillProgrammeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.rongwei.sfcommon.sys.service.impl;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -55,8 +56,12 @@ public class AspSafetyDrillProgrammeServiceImpl extends ServiceImpl<AspSafetyDri
         LambdaQueryWrapper<AspSafetyDrillProgrammeDo> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(AspSafetyDrillProgrammeDo::getDrillstatus, "20");
 
-        queryWrapper.apply("DAY( DRILLTIME ) = DAY (NOW())");
+        Date nowDate = new Date();
+        String format = DateUtil.format(nowDate, "yyyy-MM-dd");
+        DateTime dateTime = DateUtil.parse(format.concat(" 00:00:00"), "yyyy-MM-dd HH:mm:ss");
 
+        queryWrapper.between(AspSafetyDrillProgrammeDo::getDrilltime, dateTime, nowDate);
+//        queryWrapper.apply("DAY( DRILLTIME ) = DAY (NOW())");
         List<AspSafetyDrillProgrammeDo> list = list(queryWrapper);
 
         if(ObjectUtil.isEmpty(list)) {