From b1444ee7c513ed3322ff4086fe3a8ee6eb6a4212 Mon Sep 17 00:00:00 2001 From: Jack <jack.su@pollex.com.tw> Date: 星期三, 22 十二月 2021 21:17:41 +0800 Subject: [PATCH] Merge branch 'Phase2' of ssh://dev.pollex.com.tw:29418/pcalife/PAM into Phase2 --- pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 15 ++++----------- 1 files changed, 4 insertions(+), 11 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 30e0e47..e92150e 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,16 +1,10 @@ package com.pollex.pam.service.mapper; -import com.pollex.pam.domain.Appointment; import com.pollex.pam.domain.Consultant; -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 com.pollex.pam.service.dto.CustomerFavoriteConsultantDTO; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; @@ -33,7 +27,6 @@ consultantDTO.setContactStatus(null); consultantDTO.setUpdateTime(null); - consultantDTO.setLatestAppointmentId(null); return consultantDTO; } @@ -50,7 +43,7 @@ consultantDTO.setContactStatus(null); consultantDTO.setUpdateTime(null); - consultantDTO.setLatestAppointmentId(null); +// consultantDTO.setLatestAppointmentId(null); return consultantDTO; } @@ -68,9 +61,9 @@ consultantDetailDTO.setSeniority(source.getSeniorityDTOString()); consultantDetailDTO.setConcept(source.getConcept()); consultantDetailDTO.setAwards(source.getAward()); - consultantDetailDTO.setImage(source.getPhotoPath()); - consultantDetailDTO.setExpertises(splitStringWithChar(source.getExpertise())); - consultantDetailDTO.setExperiences(splitStringWithChar(source.getExperience())); + consultantDetailDTO.setImg(source.getPhotoPath()); + consultantDetailDTO.setExpertise(splitStringWithChar(source.getExpertise())); + consultantDetailDTO.setExperiences(source.getExperience()); // todo 瘙箏����漲 consultantDetailDTO.setSuitability(50); -- Gitblit v1.8.0