ContiNew/continew-starter
1
1
Fork 0
mirror of https://github.com/continew-org/continew-starter.git synced 2025-09-09 08:57:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(data): Query 注解新增多列查询逻辑关系支持（原来仅支持或者，现在也支持并且）

Browse Source
This commit is contained in:
Charles7c
2025-07-22 20:44:46 +08:00
parent 0a9027d91f
commit 3e822c0b84
3 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
continew-starter-data/continew-starter-data-mp/src/main/java/top/continew/starter/data/util/QueryWrapperHelper.java
View File

@@ -32,6 +32,7 @@ import top.continew.starter.core.util.validation.ValidationUtils;
import top.continew.starter.data.annotation.Query;
import top.continew.starter.data.annotation.QueryIgnore;
import top.continew.starter.data.enums.QueryType;
import top.continew.starter.data.enums.LogicalRelation;
import java.lang.reflect.Field;
import java.util.ArrayList;
@@ -174,8 +175,21 @@ public class QueryWrapperHelper {
return consumers;
}
// 解析多列查询
LogicalRelation logicalRelation = queryAnnotation.logicalRelation();
List<Consumer<QueryWrapper<R>>> columnConsumers = new ArrayList<>();
for (String column : columns) {
parse(queryType, column, fieldValue, consumers);
parse(queryType, column, fieldValue, columnConsumers);
}
if (logicalRelation == LogicalRelation.AND) {
if (!columnConsumers.isEmpty()) {
consumers.add(q -> {
columnConsumers.get(0).accept(q);
columnConsumers.subList(1, columnConsumers.size()).forEach(q::and);
});
}
} else {
consumers.addAll(columnConsumers);
}
return consumers;
} catch (BadRequestException e) {