admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 00:58:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

!199 fix：JSON 框架解析错误

Browse Source 
Merge pull request !199 from 王帅/main
This commit is contained in:
Michael Yang 2023-07-28 06:34:40 +00:00 committed by Gitee
commit a911201ee6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/Model.java
View File

@ -41,7 +41,7 @@ public abstract class Model<T extends Model<T>>
* @return {@code true} 删除成功，{@code false} 删除失败 * @return {@code true} 删除成功，{@code false} 删除失败
*/ */
public boolean remove() { public boolean remove() {
return SqlUtil.toBool(baseMapper().deleteByQuery(getQueryWrapper())); return SqlUtil.toBool(baseMapper().deleteByQuery(queryWrapper()));
} }
/** /**
@ -60,7 +60,7 @@ public abstract class Model<T extends Model<T>>
* @return {@code true} 更新成功，{@code false} 更新失败 * @return {@code true} 更新成功，{@code false} 更新失败
*/ */
public boolean update(boolean ignoreNulls) { public boolean update(boolean ignoreNulls) {
return SqlUtil.toBool(baseMapper().updateByQuery((T) this, ignoreNulls, getQueryWrapper())); return SqlUtil.toBool(baseMapper().updateByQuery((T) this, ignoreNulls, queryWrapper()));
} }
/** /**
@ -69,7 +69,7 @@ public abstract class Model<T extends Model<T>>
* @return 数据数量 * @return 数据数量
*/ */
public long count() { public long count() {
return baseMapper().selectCountByQuery(getQueryWrapper()); return baseMapper().selectCountByQuery(queryWrapper());
} }
/** /**
@ -87,7 +87,7 @@ public abstract class Model<T extends Model<T>>
* @return 数据 * @return 数据
*/ */
public T one() { public T one() {
return baseMapper().selectOneByQuery(getQueryWrapper()); return baseMapper().selectOneByQuery(queryWrapper());
} }
/** /**
@ -96,7 +96,7 @@ public abstract class Model<T extends Model<T>>
* @return 数据 * @return 数据
*/ */
public T oneWithRelations() { public T oneWithRelations() {
return baseMapper().selectOneWithRelationsByQuery(getQueryWrapper().limit(1)); return baseMapper().selectOneWithRelationsByQuery(queryWrapper().limit(1));
} }
/** /**
@ -123,7 +123,7 @@ public abstract class Model<T extends Model<T>>
* @return 数据列表 * @return 数据列表
*/ */
public List<T> list() { public List<T> list() {
return baseMapper().selectListByQuery(getQueryWrapper()); return baseMapper().selectListByQuery(queryWrapper());
} }
/** /**
@ -132,7 +132,7 @@ public abstract class Model<T extends Model<T>>
* @return 数据列表 * @return 数据列表
*/ */
public List<T> listWithRelations() { public List<T> listWithRelations() {
return baseMapper().selectListWithRelationsByQuery(getQueryWrapper()); return baseMapper().selectListWithRelationsByQuery(queryWrapper());
} }
/** /**
@ -142,7 +142,7 @@ public abstract class Model<T extends Model<T>>
* @return 分页数据 * @return 分页数据
*/ */
public Page<T> page(Page<T> page) { public Page<T> page(Page<T> page) {
return baseMapper().paginate(page, getQueryWrapper()); return baseMapper().paginate(page, queryWrapper());
} }
/** /**
@ -152,7 +152,7 @@ public abstract class Model<T extends Model<T>>
* @return 分页数据 * @return 分页数据
*/ */
public Page<T> pageWithRelations(Page<T> page) { public Page<T> pageWithRelations(Page<T> page) {
return baseMapper().paginateWithRelations(page, getQueryWrapper()); return baseMapper().paginateWithRelations(page, queryWrapper());
} }
} }

50
mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/QueryModel.java
View File

@ -42,7 +42,7 @@ public abstract class QueryModel<T extends QueryModel<T>> {
@Column(ignore = true) @Column(ignore = true)
private QueryWrapper queryWrapper; private QueryWrapper queryWrapper;
protected QueryWrapper getQueryWrapper() { protected QueryWrapper queryWrapper() {
if (queryWrapper == null) { if (queryWrapper == null) {
queryWrapper = QueryWrapper.create(); queryWrapper = QueryWrapper.create();
} }
@ -54,37 +54,37 @@ public abstract class QueryModel<T extends QueryModel<T>> {
} }
public T select(String... columns) { public T select(String... columns) {
getQueryWrapper().select(columns); queryWrapper().select(columns);
return (T) this; return (T) this;
} }
public T select(QueryColumn... queryColumns) { public T select(QueryColumn... queryColumns) {
getQueryWrapper().select(queryColumns); queryWrapper().select(queryColumns);
return (T) this; return (T) this;
} }
public <E> T select(LambdaGetter<E>... columns) { public <E> T select(LambdaGetter<E>... columns) {
getQueryWrapper().select(columns); queryWrapper().select(columns);
return (T) this; return (T) this;
} }
public T select(QueryColumn[]... queryColumns) { public T select(QueryColumn[]... queryColumns) {
getQueryWrapper().select(queryColumns); queryWrapper().select(queryColumns);
return (T) this; return (T) this;
} }
public T where(QueryCondition queryCondition) { public T where(QueryCondition queryCondition) {
getQueryWrapper().where(queryCondition); queryWrapper().where(queryCondition);
return (T) this; return (T) this;
} }
public T where(String sql) { public T where(String sql) {
getQueryWrapper().where(sql); queryWrapper().where(sql);
return (T) this; return (T) this;
} }
public T where(String sql, Object... params) { public T where(String sql, Object... params) {
getQueryWrapper().where(sql, params); queryWrapper().where(sql, params);
return (T) this; return (T) this;
} }
@ -93,17 +93,17 @@ public abstract class QueryModel<T extends QueryModel<T>> {
} }
public T and(QueryCondition queryCondition) { public T and(QueryCondition queryCondition) {
getQueryWrapper().and(queryCondition); queryWrapper().and(queryCondition);
return (T) this; return (T) this;
} }
public T and(String sql) { public T and(String sql) {
getQueryWrapper().and(sql); queryWrapper().and(sql);
return (T) this; return (T) this;
} }
public T and(String sql, Object... params) { public T and(String sql, Object... params) {
getQueryWrapper().and(sql, params); queryWrapper().and(sql, params);
return (T) this; return (T) this;
} }
@ -112,17 +112,17 @@ public abstract class QueryModel<T extends QueryModel<T>> {
} }
public T or(QueryCondition queryCondition) { public T or(QueryCondition queryCondition) {
getQueryWrapper().or(queryCondition); queryWrapper().or(queryCondition);
return (T) this; return (T) this;
} }
public T or(String sql) { public T or(String sql) {
getQueryWrapper().or(sql); queryWrapper().or(sql);
return (T) this; return (T) this;
} }
public T or(String sql, Object... params) { public T or(String sql, Object... params) {
getQueryWrapper().or(sql, params); queryWrapper().or(sql, params);
return (T) this; return (T) this;
} }
@ -323,32 +323,32 @@ public abstract class QueryModel<T extends QueryModel<T>> {
} }
public T groupBy(String... names) { public T groupBy(String... names) {
getQueryWrapper().groupBy(names); queryWrapper().groupBy(names);
return (T) this; return (T) this;
} }
public T groupBy(QueryColumn... columns) { public T groupBy(QueryColumn... columns) {
getQueryWrapper().groupBy(columns); queryWrapper().groupBy(columns);
return (T) this; return (T) this;
} }
public <E> T groupBy(LambdaGetter<E>... columns) { public <E> T groupBy(LambdaGetter<E>... columns) {
getQueryWrapper().groupBy(columns); queryWrapper().groupBy(columns);
return (T) this; return (T) this;
} }
public T having(QueryCondition queryCondition) { public T having(QueryCondition queryCondition) {
getQueryWrapper().having(queryCondition); queryWrapper().having(queryCondition);
return (T) this; return (T) this;
} }
public T orderBy(QueryOrderBy... orderBys) { public T orderBy(QueryOrderBy... orderBys) {
getQueryWrapper().orderBy(orderBys); queryWrapper().orderBy(orderBys);
return (T) this; return (T) this;
} }
public T orderBy(String... orderBys) { public T orderBy(String... orderBys) {
getQueryWrapper().orderBy(orderBys); queryWrapper().orderBy(orderBys);
return (T) this; return (T) this;
} }
@ -357,23 +357,23 @@ public abstract class QueryModel<T extends QueryModel<T>> {
} }
public T limit(Integer rows) { public T limit(Integer rows) {
getQueryWrapper().limit(rows); queryWrapper().limit(rows);
return (T) this; return (T) this;
} }
public T offset(Integer offset) { public T offset(Integer offset) {
getQueryWrapper().offset(offset); queryWrapper().offset(offset);
return (T) this; return (T) this;
} }
public T limit(Integer offset, Integer rows) { public T limit(Integer offset, Integer rows) {
getQueryWrapper().limit(offset, rows); queryWrapper().limit(offset, rows);
return (T) this; return (T) this;
} }
protected JoinBuilder<T> joins(String type, QueryTable table, boolean when) { protected JoinBuilder<T> joins(String type, QueryTable table, boolean when) {
Join join = new Join(type, table, when); Join join = new Join(type, table, when);
CPI.addJoin(getQueryWrapper(), join); CPI.addJoin(queryWrapper(), join);
return new JoinBuilder<>((T) this, join); return new JoinBuilder<>((T) this, join);
} }
@ -385,7 +385,7 @@ public abstract class QueryModel<T extends QueryModel<T>> {
protected JoinBuilder<T> joins(String type, QueryWrapper queryWrapper, boolean when) { protected JoinBuilder<T> joins(String type, QueryWrapper queryWrapper, boolean when) {
Join join = new Join(type, queryWrapper, when); Join join = new Join(type, queryWrapper, when);
CPI.addJoin(getQueryWrapper(), join); CPI.addJoin(queryWrapper(), join);
return new JoinBuilder<>((T) this, join); return new JoinBuilder<>((T) this, join);
} }

76
mybatis-flex-core/src/main/java/com/mybatisflex/core/activerecord/query/WhereBuilder.java
View File

@ -44,14 +44,14 @@ public class WhereBuilder<R extends QueryModel<R>> {
public R eq(Object value) { public R eq(Object value) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.eq(value), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.eq(value), connector);
} }
return queryModel; return queryModel;
} }
public <T> R eq(Object value, Predicate<T> when) { public <T> R eq(Object value, Predicate<T> when) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.eq(value, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.eq(value, when), connector);
} }
return queryModel; return queryModel;
} }
@ -66,14 +66,14 @@ public class WhereBuilder<R extends QueryModel<R>> {
public R ne(Object value) { public R ne(Object value) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.ne(value), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.ne(value), connector);
} }
return queryModel; return queryModel;
} }
public <T> R ne(Object value, Predicate<T> when) { public <T> R ne(Object value, Predicate<T> when) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.ne(value, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.ne(value, when), connector);
} }
return queryModel; return queryModel;
} }
@ -88,56 +88,56 @@ public class WhereBuilder<R extends QueryModel<R>> {
public R like(Object value) { public R like(Object value) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.like(value), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.like(value), connector);
} }
return queryModel; return queryModel;
} }
public <T> R like(Object value, Predicate<T> when) { public <T> R like(Object value, Predicate<T> when) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.like(value, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.like(value, when), connector);
} }
return queryModel; return queryModel;
} }
public R likeLeft(Object value) { public R likeLeft(Object value) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.likeLeft(value), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.likeLeft(value), connector);
} }
return queryModel; return queryModel;
} }
public <T> R likeLeft(Object value, Predicate<T> when) { public <T> R likeLeft(Object value, Predicate<T> when) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.likeLeft(value, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.likeLeft(value, when), connector);
} }
return queryModel; return queryModel;
} }
public R likeRight(Object value) { public R likeRight(Object value) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.likeRight(value), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.likeRight(value), connector);
} }
return queryModel; return queryModel;
} }
public <T> R likeRight(Object value, Predicate<T> when) { public <T> R likeRight(Object value, Predicate<T> when) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.likeRight(value, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.likeRight(value, when), connector);
} }
return queryModel; return queryModel;
} }
public R gt(Object value) { public R gt(Object value) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.gt(value), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.gt(value), connector);
} }
return queryModel; return queryModel;
} }
public <T> R gt(Object value, Predicate<T> when) { public <T> R gt(Object value, Predicate<T> when) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.gt(value, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.gt(value, when), connector);
} }
return queryModel; return queryModel;
} }
@ -152,14 +152,14 @@ public class WhereBuilder<R extends QueryModel<R>> {
public R ge(Object value) { public R ge(Object value) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.ge(value), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.ge(value), connector);
} }
return queryModel; return queryModel;
} }
public <T> R ge(Object value, Predicate<T> when) { public <T> R ge(Object value, Predicate<T> when) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.ge(value, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.ge(value, when), connector);
} }
return queryModel; return queryModel;
} }
@ -174,14 +174,14 @@ public class WhereBuilder<R extends QueryModel<R>> {
public R lt(Object value) { public R lt(Object value) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.lt(value), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.lt(value), connector);
} }
return queryModel; return queryModel;
} }
public <T> R lt(Object value, Predicate<T> when) { public <T> R lt(Object value, Predicate<T> when) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.lt(value, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.lt(value, when), connector);
} }
return queryModel; return queryModel;
} }
@ -196,14 +196,14 @@ public class WhereBuilder<R extends QueryModel<R>> {
public R le(Object value) { public R le(Object value) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.le(value), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.le(value), connector);
} }
return queryModel; return queryModel;
} }
public <T> R le(Object value, Predicate<T> when) { public <T> R le(Object value, Predicate<T> when) {
if (value != null) { if (value != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.le(value, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.le(value, when), connector);
} }
return queryModel; return queryModel;
} }
@ -217,28 +217,28 @@ public class WhereBuilder<R extends QueryModel<R>> {
} }
public R isNull() { public R isNull() {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.isNull(), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.isNull(), connector);
return queryModel; return queryModel;
} }
public <T> R isNull(Predicate<T> when) { public <T> R isNull(Predicate<T> when) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.isNull(when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.isNull(when), connector);
return queryModel; return queryModel;
} }
public R isNotNull() { public R isNotNull() {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.isNotNull(), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.isNotNull(), connector);
return queryModel; return queryModel;
} }
public <T> R isNotNull(Predicate<T> when) { public <T> R isNotNull(Predicate<T> when) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.isNotNull(when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.isNotNull(when), connector);
return queryModel; return queryModel;
} }
public R in(Object... arrays) { public R in(Object... arrays) {
if (arrays != null) { if (arrays != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.in(arrays), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.in(arrays), connector);
} }
return queryModel; return queryModel;
} }
@ -246,105 +246,105 @@ public class WhereBuilder<R extends QueryModel<R>> {
public <T> R in(Object[] arrays, Predicate<T> when) { public <T> R in(Object[] arrays, Predicate<T> when) {
//忽略 QueryWrapper.in("name", null) 的情况 //忽略 QueryWrapper.in("name", null) 的情况
if (arrays != null) { if (arrays != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.in(arrays, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.in(arrays, when), connector);
} }
return queryModel; return queryModel;
} }
public R in(R queryModel) { public R in(R queryModel) {
if (queryModel != null) { if (queryModel != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.in(queryModel), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.in(queryModel), connector);
} }
return this.queryModel; return this.queryModel;
} }
public <T> R in(R queryModel, Predicate<T> when) { public <T> R in(R queryModel, Predicate<T> when) {
if (queryModel != null) { if (queryModel != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.in(queryModel, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.in(queryModel, when), connector);
} }
return this.queryModel; return this.queryModel;
} }
public R in(Collection<?> collection) { public R in(Collection<?> collection) {
if (queryModel != null) { if (queryModel != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.in(collection), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.in(collection), connector);
} }
return queryModel; return queryModel;
} }
public <T> R in(Collection<?> collection, Predicate<T> when) { public <T> R in(Collection<?> collection, Predicate<T> when) {
if (queryModel != null) { if (queryModel != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.in(collection, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.in(collection, when), connector);
} }
return queryModel; return queryModel;
} }
public R notIn(Object... arrays) { public R notIn(Object... arrays) {
if (queryModel != null) { if (queryModel != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notIn(arrays), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notIn(arrays), connector);
} }
return queryModel; return queryModel;
} }
public <T> R notIn(Object[] arrays, Predicate<T> when) { public <T> R notIn(Object[] arrays, Predicate<T> when) {
if (queryModel != null) { if (queryModel != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notIn(arrays, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notIn(arrays, when), connector);
} }
return queryModel; return queryModel;
} }
public R notIn(Collection<?> collection) { public R notIn(Collection<?> collection) {
if (queryModel != null) { if (queryModel != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notIn(collection), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notIn(collection), connector);
} }
return queryModel; return queryModel;
} }
public <T> R notIn(Collection<?> collection, Predicate<T> when) { public <T> R notIn(Collection<?> collection, Predicate<T> when) {
if (queryModel != null) { if (queryModel != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notIn(collection, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notIn(collection, when), connector);
} }
return queryModel; return queryModel;
} }
public R notIn(R queryModel) { public R notIn(R queryModel) {
if (queryModel != null) { if (queryModel != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notIn(queryModel), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notIn(queryModel), connector);
} }
return this.queryModel; return this.queryModel;
} }
public <T> R notIn(R queryModel, Predicate<T> when) { public <T> R notIn(R queryModel, Predicate<T> when) {
if (queryModel != null) { if (queryModel != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notIn(queryModel, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notIn(queryModel, when), connector);
} }
return this.queryModel; return this.queryModel;
} }
public R between(Object start, Object end) { public R between(Object start, Object end) {
if (queryModel != null) { if (queryModel != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.between(start, end), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.between(start, end), connector);
} }
return queryModel; return queryModel;
} }
public <T> R between(Object start, Object end, Predicate<T> when) { public <T> R between(Object start, Object end, Predicate<T> when) {
if (queryModel != null) { if (queryModel != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.between(start, end, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.between(start, end, when), connector);
} }
return queryModel; return queryModel;
} }
public R notBetween(Object start, Object end) { public R notBetween(Object start, Object end) {
if (queryModel != null) { if (queryModel != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notBetween(start, end), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notBetween(start, end), connector);
} }
return queryModel; return queryModel;
} }
public <T> R notBetween(Object start, Object end, Predicate<T> when) { public <T> R notBetween(Object start, Object end, Predicate<T> when) {
if (queryModel != null) { if (queryModel != null) {
CPI.addWhereQueryCondition(queryModel.getQueryWrapper(), queryColumn.notBetween(start, end, when), connector); CPI.addWhereQueryCondition(queryModel.queryWrapper(), queryColumn.notBetween(start, end, when), connector);
} }
return queryModel; return queryModel;
} }