From 40ba87b958d3b53f2eef4f95eb3add6548f35006 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 03 十二月 2021 11:18:48 +0800
Subject: [PATCH] [update] 我的顧問清單新增預約單歷史明細、預約單的更新API、預約單的邏輯刪除API
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 0fdb98e..dda2ade 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() {
@@ -34,7 +33,7 @@
}
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()));
}
Predicate[] predicates = new Predicate[set.size()];
@@ -58,11 +57,24 @@
}
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));
+ }
}
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<>();
--
Gitblit v1.8.0