From 1b160cea79256fb1880cdfdd8fd9a823c679dc41 Mon Sep 17 00:00:00 2001 From: wangyu <727842003@qq.com> Date: Sun, 10 Jan 2021 21:42:12 +0800 Subject: [PATCH] =?UTF-8?q?Feat=EF=BC=9A=E5=8E=9F=E7=94=9F=E5=86=85?= =?UTF-8?q?=E7=BD=AE=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flyfish/framework/domain/base/NameLikeQo.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/flyfish-data/src/main/java/com/flyfish/framework/domain/base/NameLikeQo.java b/flyfish-data/src/main/java/com/flyfish/framework/domain/base/NameLikeQo.java index 0932853..732ab7a 100644 --- a/flyfish-data/src/main/java/com/flyfish/framework/domain/base/NameLikeQo.java +++ b/flyfish-data/src/main/java/com/flyfish/framework/domain/base/NameLikeQo.java @@ -8,6 +8,7 @@ import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.util.StringUtils; import java.util.Collection; +import java.util.List; /** * 基于名字模糊匹配的查询实体 @@ -20,13 +21,9 @@ public class NameLikeQo extends BaseQo { protected String code; - protected String createTimeStart; + protected List createTimeRange; - protected String createTimeEnd; - - protected String modifyTimeStart; - - protected String modifyTimeEnd; + protected List modifyTimeRange; protected String creatorId; @@ -55,10 +52,8 @@ public class NameLikeQo extends BaseQo { .with("enable", "code", "creatorId", "modifierId") .with("ids", "id", CriteriaBuilder.Builders.IN) .with("excludeId", "id", Criteria::ne) - .with("createTimeStart", "createTime", CriteriaBuilder.Builders.DATE_GTE) - .with("createTimeEnd", "createTime", CriteriaBuilder.Builders.DATE_LTE) - .with("modifyTimeStart", "modifyTime", CriteriaBuilder.Builders.DATE_GTE) - .with("modifyTimeEnd", "modifyTime", CriteriaBuilder.Builders.DATE_LTE); + .with("createTimeRange", "createTime", CriteriaBuilder.Builders.DATE_RANGE) + .with("modifyTimeRange", "modifyTime", CriteriaBuilder.Builders.DATE_RANGE); }