chore: 批次状态查询支持多选

This commit is contained in:
xlsea 2024-10-24 14:48:55 +08:00
parent fd5cce0142
commit 2e3f02072c
2 changed files with 4 additions and 2 deletions

View File

@ -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<Integer> taskBatchStatus;
private String groupName;
}

View File

@ -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())