[update] #todo 129741，調整配對條件為0或空字串時忽略該條件

wayne

2021-11-12 42a961615f459fd111b8cd192df89ecf43fad1c6

[update] #todo 129741，調整配對條件為0或空字串時忽略該條件

 pamapi/src/main/java/com/pollex/pam/enums/GenderEnum.java

@@ -14,7 +14,7 @@
    @JsonCreator
    public static GenderEnum forName(String name) {
        for(GenderEnum c: values()) {
            if(c.name().equals(name)) {
            if(c.name().equals(name.toUpperCase())) {
                return c;
            }
        }

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

@@ -26,14 +26,14 @@
                Set<Predicate> set = new HashSet<>();

                param.getCommunicationStyles().forEach((communicationStyle) -> {
                    set.add(criteriaBuilder.like(root.get("concept"), "%" + param.getCommunicationStyles()));
                    set.add(criteriaBuilder.like(root.get("concept"), "%" + param.getCommunicationStyles() + "%"));
                });

                if(Objects.nonNull(param.getGender())) {
                    set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
                }

                if(Objects.nonNull(param.getAvgScore())) {
                if(Objects.nonNull(param.getAvgScore()) && param.getAvgScore().intValue() != 0) {
                    set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
                }

@@ -57,7 +57,7 @@
                    set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
                }

                if(Objects.nonNull(param.getAvgScore())) {
                if(Objects.nonNull(param.getAvgScore()) && param.getAvgScore().intValue() != 0) {
                    set.add(criteriaBuilder.between(root.get("avgScore"), param.getAvgScore().intValue() - 1, param.getAvgScore().intValue() + 1));
                }

@@ -66,13 +66,13 @@
                }

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