lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 07:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

完善查询

Browse Source
This commit is contained in:
lihongjie0209
2023-08-24 22:34:20 +08:00
parent 0f667ba572
commit 1c9944bfc3
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/cn/lihongjie/coal/dto/CommonQuery.java
View File

@@ -11,9 +11,11 @@ import jakarta.persistence.criteria.Root;
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.EntityType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.With;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.core.convert.ConversionService;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification;
@@ -63,6 +65,7 @@ public class CommonQuery {
private String key;
private String opt;
private String value;
@Builder.Default
private String group = "default";
private String min;
private String max;
@@ -421,6 +424,8 @@ public class CommonQuery {
if (CollectionUtils.isNotEmpty(items)) {
items.forEach(x -> x.setGroup(StringUtils.defaultIfBlank(x.getGroup(), "default")));
Map<String, List<QueryItem>> group = items.stream().collect(Collectors.groupingBy(i -> i.group));
List<Predicate> orPredicates = new ArrayList<>();