hmy преди 1 година
родител
ревизия
91abdfb1b9

+ 1 - 1
pom.xml

@@ -7,7 +7,7 @@
 
 	<groupId>cn.flowbb.boot</groupId>
 	<artifactId>spring-boot-starter-mybatis</artifactId>
-	<version>0.0.5-SNAPSHOT</version>
+	<version>0.0.6-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>spring-boot-starter-mybatis</name>

+ 41 - 3
src/main/java/cn/flowbb/framework/mybatis/core/mapper/BaseMapperX.java

@@ -129,7 +129,8 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return selectList(new QueryWrapper<T>().in(field1, value1).in(field2, value2));
 	}
 
-	default List<T> selectIn(SFunction<T, ?> field1, Collection<?> value1, SFunction<T, ?> field2, Collection<?> value2) {
+	default List<T> selectIn(SFunction<T, ?> field1, Collection<?> value1, SFunction<T, ?> field2,
+			Collection<?> value2) {
 		return selectList(new LambdaQueryWrapper<T>().in(field1, value1).in(field2, value2));
 	}
 
@@ -162,6 +163,8 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 		return selectList(new QueryWrapper<>());
 	}
 
+	// 这里是equal操作查询
+
 	default List<T> selectList(String field, Object value) {
 		return selectList(new QueryWrapper<T>().eq(field, value));
 	}
@@ -175,10 +178,45 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
 	}
 
 	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));
+		return selectList(new LambdaQueryWrapper<T>().in(field1, value1).eq(field2, values));
+	}
+
+	// 这个是list in 查询
+	default List<T> selectList(String field, Collection<?> value) {
+		return selectList(new QueryWrapper<T>().in(field, value));
+	}
+
+	default List<T> selectList(SFunction<T, ?> field, Collection<?> value) {
+		return selectList(new LambdaQueryWrapper<T>().in(field, value));
+	}
+
+	default List<T> selectList(String field1, Collection<?> value1, String field2, Collection<?> value2) {
+		return selectList(new QueryWrapper<T>().in(field1, value1).in(field2, value2));
+	}
+
+	default List<T> selectList(SFunction<T, ?> field1, Collection<?> value1, SFunction<T, ?> field2,
+			Collection<?> values) {
+		return selectList(new LambdaQueryWrapper<T>().in(field1, value1).in(field2, values));
+	}
+
+	// 这里是equal和in操作查询
+
+	default List<T> selectList(SFunction<T, ?> field1, Collection<?> value1, SFunction<T, ?> field2, Object values) {
+		return selectList(new LambdaQueryWrapper<T>().in(field1, value1).eq(field2, values));
+	}
+
+	default List<T> selectList(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Collection<?> value2) {
+		return selectList(new LambdaQueryWrapper<T>().eq(field1, value1).in(field2, value2));
+	}
+
+	default List<T> selectList(String field1, Collection<?> value1, String field2, Object values2) {
+		return selectList(new QueryWrapper<T>().in(field1, value1).eq(field2, values2));
+	}
+
+	default List<T> selectList(String field1, Object value1, String field2, Collection<?> value2) {
+		return selectList(new QueryWrapper<T>().eq(field1, value1).in(field2, value2));
 	}
 
-	
 	// 查询selectList----------------end----------------------
 
 	// 删除条件-----------------------start--------------------------------

+ 37 - 13
src/main/java/cn/flowbb/framework/mybatis/core/service/AbstractService.java

@@ -196,45 +196,69 @@ public interface AbstractService<T> extends MPJBaseService<T> {
 
 	// 查询得到一个结果得值--------------end----------------------------------------------
 	// 查询selectList----------------start----------------------
-	default List<T> list() {
+	// 查询selectList----------------start----------------------
+	default List<T> selectList() {
 		return getBaseMapper().selectList();
 	}
 
-	default List<T> list(String field, Object value) {
+	// 这里是equal操作查询
+
+	default List<T> selectList(String field, Object value) {
+		return getBaseMapper().selectList(field, value);
+	}
+
+	default List<T> selectList(SFunction<T, ?> field, Object value) {
+		return selectList(field, value);
+	}
+
+	default List<T> selectList(String field1, Object value1, String field2, Object value2) {
+		return selectList(field1, value1, field2, value2);
+	}
+
+	default List<T> selectList(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object values) {
+		return selectList(field1, value1, field2, values);
+	}
+
+	// 这个是list in 查询
+	default List<T> selectList(String field, Collection<?> value) {
 		return getBaseMapper().selectList(field, value);
 	}
 
-	default List<T> list(SFunction<T, ?> field, Object value) {
+	default List<T> selectList(SFunction<T, ?> field, Collection<?> value) {
 		return getBaseMapper().selectList(field, value);
 	}
 
-	default List<T> list(String field1, Object value1, String field2, Object value2) {
+	default List<T> selectList(String field1, Collection<?> value1, String field2, Collection<?> value2) {
 		return getBaseMapper().selectList(field1, value1, field2, value2);
 	}
 
-	default List<T> list(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Object value2) {
-		return getBaseMapper().selectList(field1, value1, field2, value2);
+	default List<T> selectList(SFunction<T, ?> field1, Collection<?> value1, SFunction<T, ?> field2,
+			Collection<?> values) {
+		return getBaseMapper().selectList(field1, value1, field2, values);
 	}
-	// 查询集合
 
-	default List<T> list(String field, Collection<?> values) {
-		return getBaseMapper().selectList(field, values);
+	// 这里是equal和in操作查询
+
+	default List<T> selectList(SFunction<T, ?> field1, Collection<?> value1, SFunction<T, ?> field2, Object values) {
+		return getBaseMapper().selectList(field1, value1, field2, values);
 	}
 
-	default List<T> list(SFunction<T, ?> field, Collection<?> values) {
-		return getBaseMapper().selectList(field, values);
+	default List<T> selectList(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Collection<?> value2) {
+		return getBaseMapper().selectList(field1, value1, field2, value2);
 	}
 
-	default List<T> list(String field1, Object value1, String field2, Collection<?> values2) {
+	default List<T> selectList(String field1, Collection<?> value1, String field2, Object values2) {
 		return getBaseMapper().selectList(field1, value1, field2, values2);
 	}
 
-	default List<T> list(SFunction<T, ?> field1, Object value1, SFunction<T, ?> field2, Collection<?> value2) {
+	default List<T> selectList(String field1, Object value1, String field2, Collection<?> value2) {
 		return getBaseMapper().selectList(field1, value1, field2, value2);
 	}
 
 	// 查询selectList----------------end----------------------
 
+	// 查询selectList----------------end----------------------
+
 	// 查询in得集合----------------start---------------------------------------
 	default List<T> in(String field, Collection<?> value) {
 		return getBaseMapper().selectIn(field, value);