Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into ...

Tomas

2022-01-24 73307b0ada907f8ac857b3dfc4e7d50e3b7b92e9

 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.consts.SeniorityQueryConst.*;

public class ConsultantQuerySpec {
    private ConsultantQuerySpec() {
    }
@@ -31,7 +33,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(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()];
@@ -55,7 +66,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(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())) {