|
|
@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.ZoneId;
|
|
|
+import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.Objects;
|
|
|
@@ -204,9 +205,10 @@ public class ExecutionTaskServiceImpl implements ExecutionTaskService {
|
|
|
.minusDays(6)
|
|
|
.atZone(ZoneId.systemDefault())
|
|
|
.toInstant());
|
|
|
+ List<Integer> taskStatusList = Arrays.asList(ExecutionTaskStatusEnum.SUBMITTED.getValue(),ExecutionTaskStatusEnum.RUNNING.getValue());
|
|
|
LambdaQueryWrapper<SdExecutionTask> wrapper = Wrappers.lambdaQuery(SdExecutionTask.class)
|
|
|
.eq(SdExecutionTask::getIsDeleted, IsDeleteEnum.NORMAL.getValue())
|
|
|
- .eq(SdExecutionTask::getTaskStatus, ExecutionTaskStatusEnum.SUBMITTED.getValue())
|
|
|
+ .in(SdExecutionTask::getTaskStatus, taskStatusList)
|
|
|
.ge(SdExecutionTask::getCreateTime, hourAgo);
|
|
|
List<SdExecutionTask> list = sdExecutionTaskMapper.selectList(wrapper);
|
|
|
if (Objects.isNull(list) || list.isEmpty()) {
|