增加条件查询

src/main/java/cn/flowbb/framework/mybatis/core/mapper/BaseMapperX.java

@@ -75,6 +75,7 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
 	}
 
+	// ------selectOne查询从一个条件到三个条件---start--------------------------------------------
 	default T selectOne(String field, Object value) {
 		return selectOne(new QueryWrapper<T>().eq(field, value));
 	}
@@ -91,12 +92,17 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return selectOne(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2));
 	}
 
+	default T selectOne(String field1, Object value1, String field2, Object value2, String field3, Object value3) {
+		return selectOne(new QueryWrapper<T>().eq(field1, value1).eq(field2, value2).eq(field3, value3));
+	}
+
 	default T selectOne(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2,
 			SFunction<T, ?> field3, Object value3) {
 		return selectOne(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2).eq(field3, value3));
 	}
+	// ------selectOne查询从一个条件到三个条件---end--------------------------------------------
 
-	// 查询in得集合
+	// 查询in得集合----------------start---------------------------------------
 	default List<T> selectIn(String field, Object value) {
 		return selectList(new QueryWrapper<T>().in(field, value));
 	}
@@ -113,6 +119,9 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return selectList(new LambdaQueryWrapper<T>().in(field1, value1).in(field2, value2));
 	}
 
+	// 查询in得集合----------------end---------------------------------------
+
+	// 查询selectCount----------------start----------------------
 	default Long selectCount() {
 		return selectCount(new QueryWrapper<>());
 	}
@@ -125,6 +134,16 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return selectCount(new LambdaQueryWrapper<T>().eq(field, value));
 	}
 
+	default Long selectCount(String field1, Object value1, String field2, Object value2) {
+		return selectCount(new QueryWrapper<T>().eq(field2, value2));
+	}
+
+	default Long selectCount(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2) {
+		return selectCount(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2));
+	}
+	// 查询selectCount----------------end----------------------
+
+	// 查询selectList----------------start----------------------
 	default List<T> selectList() {
 		return selectList(new QueryWrapper<>());
 	}
@@ -141,6 +160,11 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return selectList(new QueryWrapper<T>().eq(field1, value1).eq(field2, value2));
 	}
 
+	default List<T> selectList(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object values) {
+		return selectList(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, values));
+	}
+
+	// 查询集合得
 	default List<T> selectList(String field, Collection<?> values) {
 		if (CollUtil.isEmpty(values)) {
 			return CollUtil.newArrayList();
@@ -155,10 +179,25 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return selectList(new LambdaQueryWrapper<T>().in(field, values));
 	}
 
-	default List<T> selectList(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2) {
-		return selectList(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2));
+	default List<T> selectList(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Collection<?> values) {
+		return selectList(new LambdaQueryWrapper<T>().eq(field1, value1).in(field2, values));
+	}
+
+	default List<T> selectList(String field1, Object value1, String field2, Collection<?> values) {
+		return selectList(new QueryWrapper<T>().eq(field1, value1).in(field2, values));
+	}
+	// 查询selectList----------------end----------------------
+
+	// 删除条件-----------------------start--------------------------------
+	default int delete(String field, String value) {
+		return delete(new QueryWrapper<T>().eq(field, value));
 	}
 
+	default int delete(SFunction<T, ?> field, Object value) {
+		return delete(new LambdaQueryWrapper<T>().eq(field, value));
+	}
+
+	// 删除条件-----------------------end--------------------------------
 	/**
 	 * 批量插入，适合大量数据插入
 	 *
@@ -178,10 +217,6 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return Db.saveBatch(entities, size);
 	}
 
-	default int updateBatch(T update) {
-		return update(update, new QueryWrapper<>());
-	}
-
 	default Boolean updateBatch(Collection<T> entities) {
 		return Db.updateBatchById(entities);
 	}
@@ -198,12 +233,4 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return Db.saveOrUpdateBatch(collection);
 	}
 
-	default int delete(String field, String value) {
-		return delete(new QueryWrapper<T>().eq(field, value));
-	}
-
-	default int delete(SFunction<T, ?> field, Object value) {
-		return delete(new LambdaQueryWrapper<T>().eq(field, value));
-	}
-
 }

src/main/java/cn/flowbb/framework/mybatis/core/service/AbstractService.java

@@ -182,7 +182,7 @@ public interface AbstractService<T> extends MPJBaseService<T> {
 		return getBaseMapper().selectPage(page, t);
 	}
 
-	// 查询得到一个结果得值
+	// 查询得到一个结果得值--------------start----------------------------------------------
 	default T getOne(String field, Object value) {
 		return getBaseMapper().selectOne(new QueryWrapper<T>().eq(field, value));
 	}
@@ -210,24 +210,49 @@ public interface AbstractService<T> extends MPJBaseService<T> {
 				.selectOne(new LambdaQueryWrapper<T>().eq(field1, value1).eq(field2, value2).eq(field3, value3));
 	}
 
-	// 查询in得集合
-	default List<T> in(String field, Object value) {
+	// 查询得到一个结果得值--------------end----------------------------------------------
+	// 查询selectList----------------start----------------------
+	default List<T> selectList() {
+		return getBaseMapper().selectList();
+	}
+
+	default List<T> selectList(String field, Object value) {
 		return getBaseMapper().selectList(field, value);
 	}
 
-	default List<T> in(SFunction<T, ?> field, Object value) {
+	default List<T> selectList(SFunction<T, ?> field, Object value) {
 		return getBaseMapper().selectList(field, value);
 	}
 
-	default List<T> in(String field1, Object value1, String field2, Object value2) {
-		return getBaseMapper().selectList(field1, value1,field2,value2);
+	default List<T> selectList(String field1, Object value1, String field2, Object value2) {
+		return getBaseMapper().selectList(field1, value1, field2, value2);
+	}
+
+	default List<T> selectList(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2) {
+		return getBaseMapper().selectList(field1, value1, field2, value2);
+	}
+	// 查询集合
+
+	default List<T> selectList(String field, Collection<?> values) {
+		return getBaseMapper().selectList(field, values);
 	}
 
-	default List<T> in(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2) {
-		return getBaseMapper().selectList(new LambdaQueryWrapper<T>().in(field1, value1).in(field2, value2));
+	default List<T> selectList(SFunction<T, ?> field, Collection<?> values) {
+		return getBaseMapper().selectList(field, values);
 	}
 
-	// select join
+	default List<T> selectList(String field1, Object value1, String field2, Collection<?> values2) {
+		return getBaseMapper().selectList(field1, value1, field2, values2);
+	}
+
+	default List<T> selectList(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Collection<?> value2) {
+		return getBaseMapper().selectList(field1, value1, field2, value2);
+	}
+
+	// 查询selectList----------------end----------------------
+
+	// select
+	// join------------------------------------------------------------------------------
 	// 带参数得查询
 	/**
 	 * 查询对象 连表查询返回记录集合