From e3a295496de4d8c16d0b9d0d3f71e65fc8dfa8f8 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期三, 10 十一月 2021 12:06:59 +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 | 73 +++++++++++++++++++++++++-----------
1 files changed, 50 insertions(+), 23 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 bfefa21..bd8c3d7 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -2,6 +2,7 @@
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.service.dto.FastQueryConsultantParam;
+import com.pollex.pam.service.dto.StrictQueryConsultantParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.jpa.domain.Specification;
@@ -9,8 +10,7 @@
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
public class ConsultantQuerySpec {
private ConsultantQuerySpec() {
@@ -25,12 +25,17 @@
public Predicate toPredicate(Root<Consultant> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
Set<Predicate> set = new HashSet<>();
- if(!StringUtils.isEmpty(param.getCommunicationStyle())) {
- set.add(criteriaBuilder.like(root.get("concept"), "%" + param.getCommunicationStyle()));
+ param.getCommunicationStyles().forEach((communicationStyle) -> {
+ set.add(criteriaBuilder.like(root.get("concept"), "%" + param.getCommunicationStyles()));
+ });
+
+ if(Objects.nonNull(param.getGender())) {
+ set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
}
- set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
- set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
+ if(Objects.nonNull(param.getAvgScore())) {
+ set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
+ }
Predicate[] predicates = new Predicate[set.size()];
predicates = set.toArray(predicates);
@@ -39,21 +44,43 @@
};
}
-// public static Specification<Consultant> getStrictQuerySpec(StrictQueryConsultantParam param) {
-// return new Specification<Consultant>() {
-// @Override
-// public Predicate toPredicate(Root<Consultant> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
-// Set<Predicate> set = new HashSet<>();
-//
-// set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
-// set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
-// set.add(criteriaBuilder.like(root.get("serve_area"),"%"+param.getArea()+"%"));
-// set.add(root.get("").in(param.getRequirements()))
-//
-// Predicate[] predicates = new Predicate[set.size()];
-// predicates = set.toArray(predicates);
-// return criteriaBuilder.or(predicates);
-// }
-// };
-// }
+ public static Specification<Consultant> getStrictQuerySpec(StrictQueryConsultantParam param) {
+ return new Specification<Consultant>() {
+ @SuppressWarnings("FieldNameHidesFieldInSuperclass")
+ private static final long serialVersionUID = 664452413090316174L;
+
+ @Override
+ public Predicate toPredicate(Root<Consultant> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
+ Set<Predicate> set = new HashSet<>();
+
+ if(Objects.nonNull(param.getGender())) {
+ set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
+ }
+
+ if(Objects.nonNull(param.getAvgScore())) {
+ set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
+ }
+
+ if(StringUtils.isNotEmpty(param.getArea())) {
+ set.add(criteriaBuilder.like(root.get("serveArea"), "%" + param.getArea() + "%"));
+ }
+
+ List<String> allRequirements = Objects.nonNull(param.getRequirements()) ? param.getRequirements() : new ArrayList<>();
+ if(Objects.nonNull(param.getOtherRequirement())) {
+ allRequirements.add(param.getOtherRequirement());
+ }
+ allRequirements.forEach(requirement -> set.add(criteriaBuilder.like(root.get("expertise"), "%" + requirement + "%")));
+
+ List<String> allPopularTags = Objects.nonNull(param.getPopularTags()) ? param.getPopularTags() : new ArrayList<>();
+ if(Objects.nonNull(param.getOtherPopularTags())) {
+ allPopularTags.add(param.getOtherPopularTags());
+ }
+ allPopularTags.forEach(popularTag -> set.add(criteriaBuilder.like(root.get("concept"), "%" + popularTag + "%")));
+
+ Predicate[] predicates = new Predicate[set.size()];
+ predicates = set.toArray(predicates);
+ return criteriaBuilder.and(predicates);
+ }
+ };
+ }
}
--
Gitblit v1.8.0