From 0a5a8848a175788ade96d12ee7073b6333b18391 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Sun, 16 Jun 2024 10:46:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.1.0-beta1):=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E6=8C=89=E6=97=B6=E9=97=B4=E6=AE=B5(createDt?= =?UTF-8?q?)=E6=9F=A5=E8=AF=A2?= 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 | 3 +++ 2 files changed, 7 insertions(+) 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..f3545558f 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.time.LocalDateTime; + /** * @author opensnail * @date 2023-10-11 22:28:07 @@ -16,4 +18,6 @@ public class JobBatchQueryVO extends BaseQueryVO { private String jobName; private Integer taskBatchStatus; private String groupName; + private LocalDateTime beginDate; + private LocalDateTime endDate; } 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 eb617eddc..1553d8dd7 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 @@ -1,6 +1,7 @@ package com.aizuda.snailjob.server.web.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.constant.SystemConstants; import com.aizuda.snailjob.common.core.util.JsonUtil; @@ -65,6 +66,8 @@ public class JobBatchServiceImpl implements JobBatchService { .in(CollUtil.isNotEmpty(groupNames), "batch.group_name", groupNames) .eq(queryVO.getTaskBatchStatus() != null, "batch.task_batch_status", queryVO.getTaskBatchStatus()) .likeRight(StrUtil.isNotBlank(queryVO.getJobName()), "job.job_name", queryVO.getJobName()) + .between(ObjUtil.isAllNotEmpty(queryVO.getBeginDate(), queryVO.getEndDate()), + "batch.create_dt", queryVO.getBeginDate(), queryVO.getEndDate()) .eq("batch.deleted", 0) .orderByDesc("batch.id"); List batchResponseDOList = jobTaskBatchMapper.selectJobBatchPageList(pageDTO, wrapper);