From ac27041be605d0f76cbf3666a46ef264cead10cb Mon Sep 17 00:00:00 2001 From: xlsea Date: Fri, 21 Jun 2024 15:27:05 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5Fmap=5Freduce):=20=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=A1=B9=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/web/model/request/JobTaskQueryVO.java | 1 + .../web/service/impl/JobTaskServiceImpl.java | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) 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 37c8aa2f4..db4b53891 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 c30d8056d..b549ff9d1 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) {