From 15352a866982e87be1a5094e86d479ab9f62ddcc Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 16 十一月 2021 10:20:25 +0800
Subject: [PATCH] [update] 加入role資料與修正快速篩選的溝通風格對應查詢
---
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 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 782e459..954d1c6 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,16 @@
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.stereotype.Service;
-import java.time.Instant;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@@ -18,7 +18,12 @@
private final static Character SPLIT_MASK = ',';
- // todo convert
+ private final AppointmentService appointmentService;
+
+ public ConsultantMapper(AppointmentService appointmentService) {
+ this.appointmentService = appointmentService;
+ }
+
public ConsultantDTO toDto(Consultant source) {
ConsultantDTO consultantDTO = new ConsultantDTO();
consultantDTO.setAgentNo(source.getAgentNo());
@@ -26,22 +31,35 @@
consultantDTO.setAvgScore(source.getAvgScore());
consultantDTO.setSeniority(source.getSeniority());
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();
+ public ConsultantDTO toDto(CustomerFavoriteConsultant customerFavoriteConsultant) {
+ Consultant consultant = customerFavoriteConsultant.getConsultant();
ConsultantDTO dto = toDto(consultant);
- Instant updateTime = customFavoriteConsultant.getLastModifiedDate();
- dto.setContactStatus(customFavoriteConsultant.getContactStatus());
- dto.setUpdateTime(updateTime);
+ final Optional<Appointment> latestAppointmentOptional = appointmentService.findByAgentNoAndCustomerId(consultant.getAgentNo(), customerFavoriteConsultant.getCustomerId())
+ .stream()
+ .max(Comparator.comparing(Appointment::getAppointmentDate));
+
+ 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;
}
@@ -60,10 +78,11 @@
consultantDetailDTO.setSeniority(source.getSeniority());
consultantDetailDTO.setConcept(source.getConcept());
consultantDetailDTO.setAwards(source.getAward());
+ consultantDetailDTO.setImage(source.getPhotoPath());
- consultantDetailDTO.setImage("");
- consultantDetailDTO.setSuitability(0);
- consultantDetailDTO.setEvaluation(0);
+ // todo 瘙箏����漲
+ consultantDetailDTO.setSuitability(50);
+ consultantDetailDTO.setEvaluation(50);
consultantDetailDTO.setExpertises(splitStringWithChar(source.getExpertise()));
consultantDetailDTO.setExperiences(splitStringWithChar(source.getExperience()));
--
Gitblit v1.8.0