From 98891d1d1bcaa414f336b9c05ad94d39fe9cb1bc Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期一, 29 十一月 2021 15:34:57 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
index c55ffe3..45f936f 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -6,10 +6,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.jpa.domain.Specification;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import javax.persistence.criteria.*;
import java.util.*;
public class ConsultantQuerySpec {
@@ -26,7 +23,7 @@
Set<Predicate> set = new HashSet<>();
param.getCommunicationStyles().forEach((communicationStyle) -> {
- set.add(criteriaBuilder.like(root.get("concept"), "%" + param.getCommunicationStyles() + "%"));
+ set.add(criteriaBuilder.like(root.get("communicationStyle"), "%" + communicationStyle + "%"));
});
if(Objects.nonNull(param.getGender())) {
@@ -34,12 +31,12 @@
}
if(Objects.nonNull(param.getAvgScore()) && param.getAvgScore().intValue() != 0) {
- set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
+ set.add(criteriaBuilder.equal(root.get("avgScore"), param.getAvgScore()));
}
Predicate[] predicates = new Predicate[set.size()];
predicates = set.toArray(predicates);
- return criteriaBuilder.or(predicates);
+ return criteriaBuilder.and(predicates);
}
};
}
@@ -58,11 +55,15 @@
}
if(Objects.nonNull(param.getAvgScore()) && param.getAvgScore().intValue() != 0) {
- set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
+ set.add(criteriaBuilder.equal(root.get("avgScore"), param.getAvgScore()));
}
if(StringUtils.isNotEmpty(param.getArea())) {
- set.add(criteriaBuilder.like(root.get("serveArea"), "%" + param.getArea() + "%"));
+ Predicate predicate1 = criteriaBuilder.like(root.get("serveArea"), "%" + param.getArea() + "%");
+ Predicate predicate2 = criteriaBuilder.like(root.get("serveArea"), "%��%");
+
+ Predicate finalPredicate = criteriaBuilder.or(predicate1, predicate2);
+ set.add(finalPredicate);
}
List<String> allRequirements = Objects.nonNull(param.getRequirements()) ? param.getRequirements() : new ArrayList<>();
--
Gitblit v1.8.0