From 236404ece951840dd3d6535d004da493d2d04af0 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 21 十二月 2021 14:26:42 +0800
Subject: [PATCH] [update] [todo 132709] 快速篩選年資選項
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 9 +++++++++
pamapi/src/main/java/com/pollex/pam/service/dto/FastQueryConsultantParam.java | 10 ++++++++++
pamapi/src/doc/顧問API/嚴選配對.txt | 2 +-
pamapi/src/doc/顧問API/快速篩選.txt | 3 ++-
4 files changed, 22 insertions(+), 2 deletions(-)
diff --git "a/pamapi/src/doc/\351\241\247\345\225\217API/\345\232\264\351\201\270\351\205\215\345\260\215.txt" "b/pamapi/src/doc/\351\241\247\345\225\217API/\345\232\264\351\201\270\351\205\215\345\260\215.txt"
index 9401136..ed11335 100644
--- "a/pamapi/src/doc/\351\241\247\345\225\217API/\345\232\264\351\201\270\351\205\215\345\260\215.txt"
+++ "b/pamapi/src/doc/\351\241\247\345\225\217API/\345\232\264\351\201\270\351\205\215\345\260\215.txt"
@@ -8,7 +8,7 @@
"area":"獢��",
"requirements": ["�摨瑁����","靽�瑼�/閬��"],
"otherRequirement": "���",
- "seniority": // "鞈楛"撣�"SENIOR"��"撟渲��"撣�"YOUNG"��"銝��"撣�"UNLIMITED"
+ "seniority": "SENIOR" // "鞈楛"撣�"SENIOR"��"撟渲��"撣�"YOUNG"��"銝��"撣�"UNLIMITED"
"popularTags":["��","憭梯","����"],
"otherPopularTags":"���",
}
diff --git "a/pamapi/src/doc/\351\241\247\345\225\217API/\345\277\253\351\200\237\347\257\251\351\201\270.txt" "b/pamapi/src/doc/\351\241\247\345\225\217API/\345\277\253\351\200\237\347\257\251\351\201\270.txt"
index b5a98d3..12f1f08 100644
--- "a/pamapi/src/doc/\351\241\247\345\225\217API/\345\277\253\351\200\237\347\257\251\351\201\270.txt"
+++ "b/pamapi/src/doc/\351\241\247\345\225\217API/\345\277\253\351\200\237\347\257\251\351\201\270.txt"
@@ -5,7 +5,8 @@
"gender": "female",
"communicationStyles": [],
"avgScore": 4,
- "status": "online"
+ "status": "online",
+ "seniority": "SENIOR" // "鞈楛"撣�"SENIOR"��"撟渲��"撣�"YOUNG"��"銝��"撣�"UNLIMITED"
}
response body:
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 dda2ade..9613973 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -36,6 +36,15 @@
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.and(predicates);
diff --git a/pamapi/src/main/java/com/pollex/pam/service/dto/FastQueryConsultantParam.java b/pamapi/src/main/java/com/pollex/pam/service/dto/FastQueryConsultantParam.java
index 76471f5..a8c443d 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/dto/FastQueryConsultantParam.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/dto/FastQueryConsultantParam.java
@@ -5,10 +5,12 @@
import java.util.List;
public class FastQueryConsultantParam {
+
private GenderEnum gender;
private List<String> communicationStyles;
private Number avgScore;
private String status;
+ private String seniority;
public GenderEnum getGender() {
return gender;
@@ -41,4 +43,12 @@
public void setStatus(String status) {
this.status = status;
}
+
+ public String getSeniority() {
+ return seniority;
+ }
+
+ public void setSeniority(String seniority) {
+ this.seniority = seniority;
+ }
}
--
Gitblit v1.8.0