[update] 因應需求並不會有全台選項，因此移除其資料，並將嚴選配對的搜尋修正

wayne

2022-02-10 cefc2c5ad32eddb94998f8ffc759f1fd8806e56e

[update] 因應需求並不會有全台選項，因此移除其資料，並將嚴選配對的搜尋修正

 pamapi/src/main/java/com/pollex/pam/service/ConsultantQuerySpec.java

@@ -65,39 +65,10 @@
                    set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
                }

                if(Objects.nonNull(param.getAvgScore()) && param.getAvgScore().intValue() != 0) {
                    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())) {
                    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);
                    set.add(criteriaBuilder.like(root.get("serveArea"), "%" + param.getArea() + "%"));
                }

                List<String> allRequirements = Objects.nonNull(param.getRequirements()) ? param.getRequirements() : new ArrayList<>();
                if(StringUtils.isNotEmpty(param.getOtherPopularTags())) {
                    allRequirements.add(param.getOtherRequirement());
                }
                allRequirements.forEach(requirement -> set.add(criteriaBuilder.like(root.get("expertise"), "%" + requirement + "%")));

                List<String> allPopularTags = Objects.nonNull(param.getPopularTags()) ? param.getPopularTags() : new ArrayList<>();
                if(StringUtils.isNotEmpty(param.getOtherPopularTags())) {
                    allPopularTags.add(param.getOtherPopularTags());
                }
                allPopularTags.forEach(popularTag -> set.add(criteriaBuilder.like(root.get("concept"), "%" + popularTag + "%")));

                
                Predicate[] predicates = new Predicate[set.size()];
                predicates = set.toArray(predicates);
                return criteriaBuilder.and(predicates);