[update] 嚴選配對年資欄位改單純字串比對，而非用enum接

wayne

2021-11-30 3d4d6480a947f2f6e032b7b4b7d04c2744115ad7

[update] 嚴選配對年資欄位改單純字串比對，而非用enum接

 pamapi/src/main/java/com/pollex/pam/consts/SeniorityQueryConst.java

比對新檔案
@@ -0,0 +1,9 @@
package com.pollex.pam.consts;

public class SeniorityQueryConst {
    public static final String SENIOR = "SENIOR";
    public static final String YOUNG = "YOUNG";
    public static final String UNLIMITED = "UNLIMITED";

    private SeniorityQueryConst() {}
}

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

檔案已刪除

 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() {
@@ -60,11 +60,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));
                    }
                }

 pamapi/src/main/java/com/pollex/pam/service/dto/StrictQueryConsultantParam.java

@@ -1,7 +1,6 @@
package com.pollex.pam.service.dto;

import com.pollex.pam.enums.GenderEnum;
import com.pollex.pam.enums.SeniorityQueryEnum;

import java.util.List;

@@ -13,7 +12,7 @@
    private String area;
    private List<String> requirements;
    private String otherRequirement;
    private SeniorityQueryEnum seniority;
    private String seniority;
    private List<String> popularTags;
    private String otherPopularTags;

@@ -65,11 +64,11 @@
        this.otherRequirement = otherRequirement;
    }

    public SeniorityQueryEnum getSeniority() {
    public String getSeniority() {
        return seniority;
    }

    public void setSeniority(SeniorityQueryEnum seniority) {
    public void setSeniority(String seniority) {
        this.seniority = seniority;
    }