From 6dd264601727f2e7ae70e5caa99f137fdad6546c Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 30 十一月 2021 19:45:31 +0800
Subject: [PATCH] [add] 【todo 131189】新增嚴選配對年資篩選功能
---
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 56 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 36 insertions(+), 20 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..8a8d485 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,47 +1,63 @@
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
+ @Autowired
+ AppointmentService appointmentService;
+
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();
+ 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;
}
@@ -56,17 +72,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(0);
- consultantDetailDTO.setEvaluation(0);
+ 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