From 4394e4248455637ab7836756058ac872fdf4af10 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:39:43 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 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 45f936f..8e14d66 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -9,6 +9,8 @@
import javax.persistence.criteria.*;
import java.util.*;
+import static com.pollex.pam.consts.SeniorityQueryConst.*;
+
public class ConsultantQuerySpec {
private ConsultantQuerySpec() {
}
@@ -31,7 +33,16 @@
}
if(Objects.nonNull(param.getAvgScore()) && param.getAvgScore().intValue() != 0) {
- set.add(criteriaBuilder.equal(root.get("avgScore"), param.getAvgScore()));
+ 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()];
@@ -54,29 +65,9 @@
set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
}
- if(Objects.nonNull(param.getAvgScore()) && param.getAvgScore().intValue() != 0) {
- set.add(criteriaBuilder.equal(root.get("avgScore"), param.getAvgScore()));
- }
-
if(StringUtils.isNotEmpty(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);
+ set.add(criteriaBuilder.like(root.get("serveArea"), "%" + param.getArea() + "%"));
}
-
- List<String> allRequirements = Objects.nonNull(param.getRequirements()) ? param.getRequirements() : new ArrayList<>();
- 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(StringUtils.isNotEmpty(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);
--
Gitblit v1.8.0