From 64b5f297cf3cb882f159b14fc14f363dc53210bb Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 08 二月 2022 12:20:24 +0800
Subject: [PATCH] fixed: [AppointmentDetail] 約訪通知按鈕跑版
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 3163411..9613973 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -9,7 +9,7 @@
import javax.persistence.criteria.*;
import java.util.*;
-import static com.pollex.pam.enums.SeniorityQueryEnum.*;
+import static com.pollex.pam.consts.SeniorityQueryConst.*;
public class ConsultantQuerySpec {
private ConsultantQuerySpec() {
@@ -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);
@@ -60,11 +69,11 @@
set.add(criteriaBuilder.greaterThanOrEqualTo(root.get("avgScore"), param.getAvgScore().intValue()));
}
- if(Objects.nonNull(param.getSeniority()) && param.getSeniority() != UNLIMITED) {
- if(param.getSeniority() == YOUNG) {
+ 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(param.getSeniority() == SENIOR) {
+ else if(SENIOR.equals(param.getSeniority())) {
set.add(criteriaBuilder.greaterThan(root.get("seniorityYear"), 5));
}
}
--
Gitblit v1.8.0