[update] [todo 136031] 諮詢度表現，提供前端該顧問所有預約單數量以及近一個月的預約單數量

wayne

2022-03-01 fa782dca2a00e9a4a48c5b3588f5eb3b47af93cf

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

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

import com.pollex.pam.domain.Consultant;
import com.pollex.pam.enums.ConsultantStatusEnum;
import com.pollex.pam.service.dto.FastQueryConsultantParam;
import com.pollex.pam.service.dto.StrictQueryConsultantParam;
import org.apache.commons.lang3.StringUtils;
@@ -19,10 +20,13 @@
        return new Specification<Consultant>() {
            @SuppressWarnings("FieldNameHidesFieldInSuperclass")
            private static final long serialVersionUID = 6644524130903161741L;
            private static final float QUERY_AVG_SCORE_OFFSET = 0.5f;

            @Override
            public Predicate toPredicate(Root<Consultant> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
                Set<Predicate> set = new HashSet<>();

                set.add(criteriaBuilder.equal(root.get("status"), ConsultantStatusEnum.AVAILABLE));

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

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

                if(StringUtils.isNotEmpty(param.getSeniority()) && !StringUtils.equals(UNLIMITED, param.getSeniority())) {
@@ -61,6 +65,8 @@
            public Predicate toPredicate(Root<Consultant> root, CriteriaQuery<?> query, CriteriaBuilder criteriaBuilder) {
                Set<Predicate> set = new HashSet<>();

                set.add(criteriaBuilder.equal(root.get("status"), ConsultantStatusEnum.AVAILABLE));

                if(Objects.nonNull(param.getGender())) {
                    set.add(criteriaBuilder.equal(root.get("gender"), param.getGender()));
                }
@@ -68,7 +74,7 @@
                if(StringUtils.isNotEmpty(param.getArea())) {
                    set.add(criteriaBuilder.like(root.get("serveArea"), "%" + param.getArea() + "%"));
                }
                

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