From 2e3f02072cab1a2a078c0a2c4fff32ee862eb9a6 Mon Sep 17 00:00:00 2001 From: xlsea Date: Thu, 24 Oct 2024 14:48:55 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=89=B9=E6=AC=A1=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../snailjob/server/web/model/request/JobBatchQueryVO.java | 4 +++- .../snailjob/server/web/service/impl/JobBatchServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobBatchQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobBatchQueryVO.java index b75a6ba7..0e68e5fc 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobBatchQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobBatchQueryVO.java @@ -4,6 +4,8 @@ import com.aizuda.snailjob.server.web.model.base.BaseQueryVO; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * @author opensnail * @date 2023-10-11 22:28:07 @@ -14,6 +16,6 @@ import lombok.EqualsAndHashCode; public class JobBatchQueryVO extends BaseQueryVO { private Long jobId; private String jobName; - private Integer taskBatchStatus; + private List taskBatchStatus; private String groupName; } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobBatchServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobBatchServiceImpl.java index 5e28fb1c..46b63452 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobBatchServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobBatchServiceImpl.java @@ -68,7 +68,7 @@ public class JobBatchServiceImpl implements JobBatchService { .eq("batch.system_task_type", SyetemTaskTypeEnum.JOB.getType()) .eq(queryVO.getJobId() != null, "batch.job_id", queryVO.getJobId()) .in(CollUtil.isNotEmpty(groupNames), "batch.group_name", groupNames) - .eq(queryVO.getTaskBatchStatus() != null, "batch.task_batch_status", queryVO.getTaskBatchStatus()) + .in(ObjUtil.isNotEmpty(queryVO.getTaskBatchStatus()), "batch.task_batch_status", queryVO.getTaskBatchStatus()) .likeRight(StrUtil.isNotBlank(queryVO.getJobName()), "job.job_name", queryVO.getJobName()) .between(ObjUtil.isAllNotEmpty(queryVO.getStartDt(), queryVO.getEndDt()), "batch.create_dt", queryVO.getStartDt(), queryVO.getEndDt())