From aa0f9381d424b98e86845c6da21e2fd8640fe056 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 21 二月 2022 18:32:45 +0800
Subject: [PATCH] [update] 若顧問狀態非啟用時，則搜尋及推薦會找不到該顧問
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 80 ++++++++++++++++++++++++++--------------
1 files changed, 52 insertions(+), 28 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..cc9d20d 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -1,16 +1,16 @@
package com.pollex.pam.service;
import com.pollex.pam.domain.Consultant;
+import com.pollex.pam.enums.ConsultantStatusEnum;
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;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.util.HashSet;
-import java.util.Set;
+import javax.persistence.criteria.*;
+import java.util.*;
+
+import static com.pollex.pam.consts.SeniorityQueryConst.*;
public class ConsultantQuerySpec {
private ConsultantQuerySpec() {
@@ -25,35 +25,59 @@
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()));
+ set.add(criteriaBuilder.equal(root.get("status"), ConsultantStatusEnum.AVAILABLE));
+
+ param.getCommunicationStyles().forEach((communicationStyle) -> {
+ set.add(criteriaBuilder.like(root.get("communicationStyle"), "%" + communicationStyle + "%"));
+ });
+
+ 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()) && param.getAvgScore().intValue() != 0) {
+ set.add(criteriaBuilder.greaterThanOrEqualTo(root.get("avgScore"), param.getAvgScore().intValue()));
+ }
+
+ if(StringUtils.isNotEmpty(param.getSeniority()) && !StringUtils.equals(UNLIMITED, param.getSeniority())) {
+ if(YOUNG.equals(param.getSeniority())) {
+ set.add(criteriaBuilder.lessThanOrEqualTo(root.get("seniorityYear"), 5));
+ }
+ else if(SENIOR.equals(param.getSeniority())) {
+ set.add(criteriaBuilder.greaterThan(root.get("seniorityYear"), 5));
+ }
+ }
Predicate[] predicates = new Predicate[set.size()];
predicates = set.toArray(predicates);
- return criteriaBuilder.or(predicates);
+ return criteriaBuilder.and(predicates);
}
};
}
-// 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<>();
+
+ set.add(criteriaBuilder.equal(root.get("status"), ConsultantStatusEnum.AVAILABLE));
+
+ if(Objects.nonNull(param.getGender())) {
+ set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
+ }
+
+ if(StringUtils.isNotEmpty(param.getArea())) {
+ set.add(criteriaBuilder.like(root.get("serveArea"), "%" + param.getArea() + "%"));
+ }
+
+ Predicate[] predicates = new Predicate[set.size()];
+ predicates = set.toArray(predicates);
+ return criteriaBuilder.and(predicates);
+ }
+ };
+ }
}
--
Gitblit v1.8.0