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 b75a6ba74..0e68e5fca 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 5e28fb1c0..46b634520 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())