From e28415e8f6d76ddcf0c936027669c22ed2b2e05d Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 25 十一月 2021 13:48:37 +0800
Subject: [PATCH] [update] 嚴選配對、快速搜尋的滿意度調整為equal

---
 pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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..0fdb98e 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -26,7 +26,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 +34,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,7 +58,7 @@
                 }
 
                 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())) {

--
Gitblit v1.8.0