From 00ac6f95a8cc129ec262f27ce6a162d0713bf002 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期四, 02 十二月 2021 16:02:40 +0800 Subject: [PATCH] [ref] 重購取得我的顧問清單程式碼 --- pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 42 ++++++++++++++++-------------------------- 1 files changed, 16 insertions(+), 26 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..e6dea8c 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,49 +1,39 @@ package com.pollex.pam.service.mapper; +import com.pollex.pam.domain.Appointment; import com.pollex.pam.domain.Consultant; -import com.pollex.pam.domain.CustomFavoriteConsultant; +import com.pollex.pam.domain.CustomerFavoriteConsultant; import com.pollex.pam.enums.ContactStatusEnum; +import com.pollex.pam.service.AppointmentService; import com.pollex.pam.service.dto.ConsultantDTO; import com.pollex.pam.service.dto.ConsultantDetailDTO; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; 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(); 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); + consultantDTO.setLatestAppointmentId(null); return consultantDTO; - } - - public ConsultantDTO toDto(CustomFavoriteConsultant customFavoriteConsultant) { - Consultant consultant = customFavoriteConsultant.getConsultant(); - ConsultantDTO dto = toDto(consultant); - - Instant updateTime = customFavoriteConsultant.getLastModifiedDate(); - dto.setContactStatus(customFavoriteConsultant.getContactStatus()); - dto.setUpdateTime(updateTime); - - return dto; } public ConsultantDetailDTO toDetailDto(Consultant source) { @@ -56,17 +46,17 @@ 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.setImage(""); - consultantDetailDTO.setSuitability(50); - consultantDetailDTO.setEvaluation(50); + consultantDetailDTO.setImage(source.getPhotoPath()); consultantDetailDTO.setExpertises(splitStringWithChar(source.getExpertise())); consultantDetailDTO.setExperiences(splitStringWithChar(source.getExperience())); + // todo 瘙箏����漲 + consultantDetailDTO.setSuitability(50); + consultantDetailDTO.setEvaluation(50); + return consultantDetailDTO; } -- Gitblit v1.8.0