From 210abe8695707b725f093eea2f95cfc49980c59f Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 03 十二月 2021 16:16:43 +0800
Subject: [PATCH] [update] 預約單dto加上預約單對應的滿意度分數
---
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 56 +++++++++++++++++++++++---------------------------------
1 files changed, 23 insertions(+), 33 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 954d1c6..30e0e47 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
@@ -7,7 +7,10 @@
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.*;
@@ -16,20 +19,14 @@
@Service
public class ConsultantMapper {
- private final static Character SPLIT_MASK = ',';
+ private static final Character SPLIT_MASK = ',';
- private final AppointmentService appointmentService;
-
- public ConsultantMapper(AppointmentService appointmentService) {
- this.appointmentService = appointmentService;
- }
-
- 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());
@@ -41,27 +38,21 @@
return consultantDTO;
}
- public ConsultantDTO toDto(CustomerFavoriteConsultant customerFavoriteConsultant) {
- Consultant consultant = customerFavoriteConsultant.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());
- final Optional<Appointment> latestAppointmentOptional = appointmentService.findByAgentNoAndCustomerId(consultant.getAgentNo(), customerFavoriteConsultant.getCustomerId())
- .stream()
- .max(Comparator.comparing(Appointment::getAppointmentDate));
+ consultantDTO.setContactStatus(null);
+ consultantDTO.setUpdateTime(null);
+ consultantDTO.setLatestAppointmentId(null);
- if(latestAppointmentOptional.isPresent()) {
- Appointment latestAppointment = latestAppointmentOptional.get();
- dto.setContactStatus(latestAppointment.getCommunicateStatus());
- dto.setLatestAppointmentId(latestAppointment.getId());
- dto.setUpdateTime(latestAppointment.getAppointmentDate());
- }
- else {
- dto.setContactStatus(ContactStatusEnum.PICKED);
- dto.setLatestAppointmentId(null);
- dto.setUpdateTime(customerFavoriteConsultant.getLastModifiedDate());
- }
-
- return dto;
+ return consultantDTO;
}
public ConsultantDetailDTO toDetailDto(Consultant source) {
@@ -74,17 +65,16 @@
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(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