From 21d79d2a70b095545477472438d27a8827ee80b8 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期四, 10 二月 2022 14:01:00 +0800 Subject: [PATCH] [update] 嚴選搜尋新增匹配度分數 --- pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 54 +++++++++++++++++++++++++++++------------------------- 1 files changed, 29 insertions(+), 25 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java index 4fce9ec..a04507a 100644 --- a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java +++ b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java @@ -1,53 +1,58 @@ package com.pollex.pam.service.mapper; import com.pollex.pam.domain.Consultant; -import com.pollex.pam.domain.CustomFavoriteConsultant; -import com.pollex.pam.enums.ContactStatusEnum; import com.pollex.pam.service.dto.ConsultantDTO; import com.pollex.pam.service.dto.ConsultantDetailDTO; +import com.pollex.pam.service.dto.CustomerFavoriteConsultantDTO; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.time.Instant; -import java.util.Arrays; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; @Service public class ConsultantMapper { - private final static Character SPLIT_MASK = ','; + private static final Character SPLIT_MASK = ','; - // todo convert - public ConsultantDTO toDto(Consultant source) { - ConsultantDTO consultantDTO = new ConsultantDTO(); + public CustomerFavoriteConsultantDTO toCustomerFavoriteConsultantDto(Consultant source) { + CustomerFavoriteConsultantDTO consultantDTO = new CustomerFavoriteConsultantDTO(); consultantDTO.setAgentNo(source.getAgentNo()); consultantDTO.setName(source.getName()); consultantDTO.setAvgScore(source.getAvgScore()); - consultantDTO.setSeniority(source.getSeniority()); + consultantDTO.setSeniority(source.getSeniorityDTOString()); consultantDTO.setExpertise(splitStringWithChar(source.getExpertise())); + consultantDTO.setImg(source.getPhotoPath()); + consultantDTO.setRole(source.getRole()); - // todo - consultantDTO.setImg(""); consultantDTO.setContactStatus(null); consultantDTO.setUpdateTime(null); return consultantDTO; } - public ConsultantDTO toDto(CustomFavoriteConsultant customFavoriteConsultant) { - Consultant consultant = customFavoriteConsultant.getConsultant(); - ConsultantDTO dto = toDto(consultant); + public ConsultantDTO toDto(Consultant source) { + ConsultantDTO consultantDTO = new ConsultantDTO(); + consultantDTO.setAgentNo(source.getAgentNo()); + consultantDTO.setName(source.getName()); + consultantDTO.setAvgScore(source.getAvgScore()); + consultantDTO.setSeniority(source.getSeniorityDTOString()); + consultantDTO.setExpertise(splitStringWithChar(source.getExpertise())); + consultantDTO.setImg(source.getPhotoPath()); + consultantDTO.setRole(source.getRole()); - Instant updateTime = customFavoriteConsultant.getLastModifiedDate(); - dto.setContactStatus(customFavoriteConsultant.getContactStatus()); - dto.setUpdateTime(updateTime); + consultantDTO.setSuitability(0); + consultantDTO.setContactStatus(null); + consultantDTO.setUpdateTime(null); +// consultantDTO.setLatestAppointmentId(null); - return dto; + return consultantDTO; } public ConsultantDetailDTO toDetailDto(Consultant source) { ConsultantDetailDTO consultantDetailDTO = new ConsultantDetailDTO(); + BeanUtils.copyProperties(source, consultantDetailDTO); consultantDetailDTO.setName(source.getName()); consultantDetailDTO.setAgentNo(source.getAgentNo()); consultantDetailDTO.setRole(source.getRole()); @@ -56,16 +61,15 @@ consultantDetailDTO.setPhoneNumber(source.getPhoneNumber()); consultantDetailDTO.setServeArea(source.getServeArea()); consultantDetailDTO.setCompanyAddress(source.getCompanyAddress()); - consultantDetailDTO.setLatestLoginTime(source.getLatestLoginTime()); - consultantDetailDTO.setSeniority(source.getSeniority()); + consultantDetailDTO.setSeniority(source.getSeniorityDTOString()); consultantDetailDTO.setConcept(source.getConcept()); consultantDetailDTO.setAwards(source.getAward()); + consultantDetailDTO.setImg(source.getPhotoPath()); + consultantDetailDTO.setExpertise(splitStringWithChar(source.getExpertise())); + consultantDetailDTO.setExperiences(source.getExperience()); - consultantDetailDTO.setImage(""); - consultantDetailDTO.setSuitability(50); + // todo ��蝣箄�垣閰W漲銵函 consultantDetailDTO.setEvaluation(50); - consultantDetailDTO.setExpertises(splitStringWithChar(source.getExpertise())); - consultantDetailDTO.setExperiences(splitStringWithChar(source.getExperience())); return consultantDetailDTO; } -- Gitblit v1.8.0