From 4df02e3b839a30ff2c68243820b48734f585baa1 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 01 三月 2022 14:29:49 +0800
Subject: [PATCH] [update] [todo 136030] 調整滿意度篩選的機制，改由指定分數扣0.5分作為查詢
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 48 +++++++++++++++++++++++-------------------------
1 files changed, 23 insertions(+), 25 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 68f4d9e..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,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 javax.persistence.criteria.*;
import java.util.*;
+
+import static com.pollex.pam.consts.SeniorityQueryConst.*;
public class ConsultantQuerySpec {
private ConsultantQuerySpec() {
@@ -20,21 +20,33 @@
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<>();
- if(StringUtils.isNotEmpty(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()));
}
- 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() - 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()];
@@ -53,29 +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())) {
- 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);
--
Gitblit v1.8.0