diff --git a/src/main/java/com/ruoyi/task/service/impl/TaskPlanServiceImpl.java b/src/main/java/com/ruoyi/task/service/impl/TaskPlanServiceImpl.java index c34c80a..3ae3938 100644 --- a/src/main/java/com/ruoyi/task/service/impl/TaskPlanServiceImpl.java +++ b/src/main/java/com/ruoyi/task/service/impl/TaskPlanServiceImpl.java @@ -204,6 +204,17 @@ public class TaskPlanServiceImpl implements ITaskPlanService { @Override public boolean deleteTaskPlan(Long planId) { + // 先获取该计划下的所有任务 + List tasks = taskDomain.getTaskByPlanId(planId); + + // 删除所有状态为待执行的任务 + for (Task task : tasks) { + if (task.getStatus() == StatusEnum.PENDING) { + taskDomain.deleteTask(task.getId()); + } + } + + // 最后删除任务计划 return taskPlanDomain.deleteTaskPlan(planId); } }