From f29fefd92b15b7eee27fb82eeb8809d1442b586f Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Thu, 5 Mar 2026 17:22:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=97=B4=E9=9A=94?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=9A=84=E6=9C=AA=E6=9D=A5=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calender/service/TaskCalendarGenerator.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/calender/service/TaskCalendarGenerator.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/calender/service/TaskCalendarGenerator.java index 112950c..f75170f 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/calender/service/TaskCalendarGenerator.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/calender/service/TaskCalendarGenerator.java @@ -124,9 +124,9 @@ public class TaskCalendarGenerator { /** * 获取指定年月日的完整日历，包含已生成的任务和未来生成的任务 * - * @param year 年 + * @param year 年 * @param month 月 - * @param day 日 + * @param day 日 * @return */ public List getFullCalendar(int year, int month, int day) { @@ -300,12 +300,14 @@ public class TaskCalendarGenerator { LocalDateTime intervalEndTime = task.getIntervalEndTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); LocalTime executeTime = LocalTime.parse(task.getIntervalExecuteTime()); - LocalDateTime startLdt = beginTime.isBefore(intervalStartTime) ? intervalStartTime : beginTime; + LocalDateTime startLdt = intervalStartTime; LocalDateTime endLdt = endTime.isAfter(intervalEndTime) ? intervalEndTime : endTime; startLdt = LocalDateTime.of(startLdt.toLocalDate(), executeTime); for (LocalDateTime date = startLdt; date.isBefore(endLdt); date = date.plusHours(intervalNumber)) { - // 判断是否为目标星期 + if (date.isBefore(beginTime)) { + continue; + } DailyTaskStatsDTO dto = DailyTaskStatsDTO.builder() .name(task.getTaskName()) .taskState(TaskStateEnum.PENDING.getCode())