From d83d50b60935ad24730488c23e996b651647c295 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 24 一月 2022 11:19:28 +0800
Subject: [PATCH] [update] 修正客戶若沒有未處理預約單時，改回null而非404
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 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 bd8c3d7..9613973 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -6,11 +6,10 @@
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.*;
+
+import static com.pollex.pam.consts.SeniorityQueryConst.*;
public class ConsultantQuerySpec {
private ConsultantQuerySpec() {
@@ -26,20 +25,29 @@
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())) {
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(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);
}
};
}
@@ -57,22 +65,35 @@
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(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));
+ }
}
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<>();
- if(Objects.nonNull(param.getOtherRequirement())) {
+ if(StringUtils.isNotEmpty(param.getOtherPopularTags())) {
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())) {
+ if(StringUtils.isNotEmpty(param.getOtherPopularTags())) {
allPopularTags.add(param.getOtherPopularTags());
}
allPopularTags.forEach(popularTag -> set.add(criteriaBuilder.like(root.get("concept"), "%" + popularTag + "%")));
--
Gitblit v1.8.0