From a9556593ae9a6227fe4612f2805c970cc4390ede Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期二, 30 十一月 2021 10:34:01 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 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 deb3705..ea9842b 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
@@ -2,12 +2,13 @@
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.util.*;
@@ -18,11 +19,8 @@
private final static Character SPLIT_MASK = ',';
- private final AppointmentService appointmentService;
-
- public ConsultantMapper(AppointmentService appointmentService) {
- this.appointmentService = appointmentService;
- }
+ @Autowired
+ AppointmentService appointmentService;
public ConsultantDTO toDto(Consultant source) {
ConsultantDTO consultantDTO = new ConsultantDTO();
@@ -32,6 +30,7 @@
consultantDTO.setSeniority(source.getSeniority());
consultantDTO.setExpertise(splitStringWithChar(source.getExpertise()));
consultantDTO.setImg(source.getPhotoPath());
+ consultantDTO.setRole(source.getRole());
consultantDTO.setContactStatus(null);
consultantDTO.setUpdateTime(null);
@@ -40,11 +39,11 @@
return consultantDTO;
}
- public ConsultantDTO toDto(CustomFavoriteConsultant customFavoriteConsultant) {
- Consultant consultant = customFavoriteConsultant.getConsultant();
+ public ConsultantDTO toDto(CustomerFavoriteConsultant customerFavoriteConsultant) {
+ Consultant consultant = customerFavoriteConsultant.getConsultant();
ConsultantDTO dto = toDto(consultant);
- final Optional<Appointment> latestAppointmentOptional = appointmentService.findByAgentNoAndCustomerId(consultant.getAgentNo(), customFavoriteConsultant.getCustomerId())
+ final Optional<Appointment> latestAppointmentOptional = appointmentService.findByAgentNoAndCustomerId(consultant.getAgentNo(), customerFavoriteConsultant.getCustomerId())
.stream()
.max(Comparator.comparing(Appointment::getAppointmentDate));
@@ -57,7 +56,7 @@
else {
dto.setContactStatus(ContactStatusEnum.PICKED);
dto.setLatestAppointmentId(null);
- dto.setUpdateTime(customFavoriteConsultant.getLastModifiedDate());
+ dto.setUpdateTime(customerFavoriteConsultant.getLastModifiedDate());
}
return dto;
@@ -73,17 +72,16 @@
consultantDetailDTO.setPhoneNumber(source.getPhoneNumber());
consultantDetailDTO.setServeArea(source.getServeArea());
consultantDetailDTO.setCompanyAddress(source.getCompanyAddress());
- consultantDetailDTO.setLatestLoginTime(source.getLatestLoginTime());
consultantDetailDTO.setSeniority(source.getSeniority());
consultantDetailDTO.setConcept(source.getConcept());
consultantDetailDTO.setAwards(source.getAward());
consultantDetailDTO.setImage(source.getPhotoPath());
+ consultantDetailDTO.setExpertises(splitStringWithChar(source.getExpertise()));
+ consultantDetailDTO.setExperiences(splitStringWithChar(source.getExperience()));
// todo 瘙箏����漲
consultantDetailDTO.setSuitability(50);
consultantDetailDTO.setEvaluation(50);
- consultantDetailDTO.setExpertises(splitStringWithChar(source.getExpertise()));
- consultantDetailDTO.setExperiences(splitStringWithChar(source.getExperience()));
return consultantDetailDTO;
}
--
Gitblit v1.8.0