diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobTaskQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobTaskQueryVO.java index 37c8aa2f..db4b5389 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobTaskQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobTaskQueryVO.java @@ -15,4 +15,5 @@ public class JobTaskQueryVO extends BaseQueryVO { private Long jobId; private Long taskBatchId; private Long parentId; + private Integer taskStatus; } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobTaskServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobTaskServiceImpl.java index c30d8056..b549ff9d 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobTaskServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobTaskServiceImpl.java @@ -35,11 +35,11 @@ public class JobTaskServiceImpl implements JobTaskService { public PageResult> getJobTaskPage(final JobTaskQueryVO queryVO) { PageDTO pageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize()); - PageDTO selectPage = jobTaskMapper.selectPage(pageDTO, new LambdaQueryWrapper() .eq(Objects.nonNull(queryVO.getJobId()), JobTask::getJobId, queryVO.getJobId()) .eq(Objects.nonNull(queryVO.getTaskBatchId()), JobTask::getTaskBatchId, queryVO.getTaskBatchId()) + .eq(Objects.nonNull(queryVO.getTaskStatus()), JobTask::getTaskStatus, queryVO.getTaskStatus()) // SQLServer 分页必须 ORDER BY .orderByAsc(JobTask::getJobId)); @@ -55,12 +55,12 @@ public class JobTaskServiceImpl implements JobTaskService { @Override public List> getTreeJobTask(final JobTaskQueryVO queryVO) { List jobTasks = jobTaskMapper.selectList( - new LambdaQueryWrapper() - .eq(JobTask::getParentId, queryVO.getParentId()) - .eq(Objects.nonNull(queryVO.getJobId()), JobTask::getJobId, queryVO.getJobId()) - .eq(Objects.nonNull(queryVO.getTaskBatchId()), JobTask::getTaskBatchId, queryVO.getTaskBatchId()) - // SQLServer 分页必须 ORDER BY - .orderByAsc(JobTask::getJobId)); + new LambdaQueryWrapper() + .eq(JobTask::getParentId, queryVO.getParentId()) + .eq(Objects.nonNull(queryVO.getJobId()), JobTask::getJobId, queryVO.getJobId()) + .eq(Objects.nonNull(queryVO.getTaskBatchId()), JobTask::getTaskBatchId, queryVO.getTaskBatchId()) + // SQLServer 分页必须 ORDER BY + .orderByAsc(JobTask::getJobId)); List> treeNodes = new ArrayList<>(); for (final JobTask jobTask : jobTasks) {