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); }