Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxTaskScheduleServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 
@@ -63,8 +64,11 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
             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() + "')");
+        if (null != handle.getSendTime()) {
+            LocalDateTime startTime = LocalDateTime.of(handle.getSendTime().toLocalDate(), LocalTime.MIN);
+            fosterwxTaskScheduleQueryWrapper.apply("UNIX_TIMESTAMP(send_time) >= UNIX_TIMESTAMP('" + startTime + "')");
+            fosterwxTaskScheduleQueryWrapper.apply("UNIX_TIMESTAMP(send_time) <= UNIX_TIMESTAMP('" + handle.getSendTime() + "')");
+        }
 
         fosterwxTaskScheduleQueryWrapper.eq("del_flg", 1);
         fosterwxTaskScheduleQueryWrapper.orderByDesc("station_id");