From 68343c0e409d7f02f29c5a832a6a1e24e9690f06 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 01 三月 2022 15:49:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Phase3' into Phase3
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 41 +++++++++++++++++++----------------------
1 files changed, 19 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..b9cba74 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -1,6 +1,7 @@
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;
@@ -8,6 +9,8 @@
import javax.persistence.criteria.*;
import java.util.*;
+
+import static com.pollex.pam.consts.SeniorityQueryConst.*;
public class ConsultantQuerySpec {
private ConsultantQuerySpec() {
@@ -17,10 +20,13 @@
return new Specification<Consultant>() {
@SuppressWarnings("FieldNameHidesFieldInSuperclass")
private static final long serialVersionUID = 6644524130903161741L;
+ private static final float QUERY_AVG_SCORE_OFFSET = 0.5f;
@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));
param.getCommunicationStyles().forEach((communicationStyle) -> {
set.add(criteriaBuilder.like(root.get("communicationStyle"), "%" + communicationStyle + "%"));
@@ -31,7 +37,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() - QUERY_AVG_SCORE_OFFSET));
+ }
+
+ 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()];
@@ -50,33 +65,15 @@
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(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