Explorar o código

支持按照当前时间进行筛选

lqc %!s(int64=5) %!d(string=hai) anos
pai
achega
c66202c057

+ 5 - 1
src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxTaskScheduleServiceImpl.java

@@ -56,12 +56,16 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
         Page<FosterwxTaskSchedule> pageObj = new Page<FosterwxTaskSchedule>(page, pagesize);
         QueryWrapper<FosterwxTaskSchedule> fosterwxTaskScheduleQueryWrapper = new QueryWrapper<>();
         fosterwxTaskScheduleQueryWrapper.select("distinct station_id,station_name,task_id,task_name,task_status,task_content,task_send_status,create_uid,send_date,send_time,err_msg,mark");
-        fosterwxTaskScheduleQueryWrapper.eq("send_date", LocalDate.parse(handle.getDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        if (null != handle.getDate() && !handle.getDate().isEmpty())
+            fosterwxTaskScheduleQueryWrapper.eq("send_date", LocalDate.parse(handle.getDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")));
         if (null != handle.getId()) fosterwxTaskScheduleQueryWrapper.eq("id", handle.getId());
         if (null != handle.getTaskName() && !handle.getTaskName().isEmpty())
             fosterwxTaskScheduleQueryWrapper.eq("task_name", handle.getTaskName());
         if (null != handle.getStationId())
             fosterwxTaskScheduleQueryWrapper.eq("station_id", handle.getStationId());
+        if (null != handle.getSendTime())
+            fosterwxTaskScheduleQueryWrapper.apply("UNIX_TIMESTAMP(send_time) <= UNIX_TIMESTAMP('" + handle.getSendTime().toString() + "')");
+
         fosterwxTaskScheduleQueryWrapper.eq("del_flg", 1);
         fosterwxTaskScheduleQueryWrapper.orderByDesc("station_id");
         fosterwxTaskScheduleQueryWrapper.orderByDesc("task_id");