保誠-保戶業務員媒合平台
wayne
2021-11-30 6dd264601727f2e7ae70e5caa99f137fdad6546c
pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java
@@ -9,6 +9,8 @@
import javax.persistence.criteria.*;
import java.util.*;
import static com.pollex.pam.enums.SeniorityQueryEnum.*;
public class ConsultantQuerySpec {
    private ConsultantQuerySpec() {
    }
@@ -31,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()];
@@ -55,7 +57,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()));
                }
                if(Objects.nonNull(param.getSeniority()) && param.getSeniority() != UNLIMITED) {
                    if(param.getSeniority() == YOUNG) {
                        set.add(criteriaBuilder.lessThanOrEqualTo(root.get("seniorityYear"), 5));
                    }
                    else if(param.getSeniority() == SENIOR) {
                        set.add(criteriaBuilder.greaterThan(root.get("seniorityYear"), 5));
                    }
                }
                if(StringUtils.isNotEmpty(param.getArea())) {