From a3716f72066d25d745f4d5103ff23a553c3e102b Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:41:19 +0800
Subject: [PATCH] Merge branch 'sit' into uat
---
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 64 +++++++++++++-------------------
1 files changed, 26 insertions(+), 38 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 ea9842b..a04507a 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,14 +1,11 @@
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.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -17,53 +14,45 @@
@Service
public class ConsultantMapper {
- private final static Character SPLIT_MASK = ',';
+ private static final Character SPLIT_MASK = ',';
- @Autowired
- 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());
consultantDTO.setContactStatus(null);
consultantDTO.setUpdateTime(null);
- consultantDTO.setLatestAppointmentId(null);
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.setSuitability(0);
+ 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) {
ConsultantDetailDTO consultantDetailDTO = new ConsultantDetailDTO();
+ BeanUtils.copyProperties(source, consultantDetailDTO);
consultantDetailDTO.setName(source.getName());
consultantDetailDTO.setAgentNo(source.getAgentNo());
consultantDetailDTO.setRole(source.getRole());
@@ -72,15 +61,14 @@
consultantDetailDTO.setPhoneNumber(source.getPhoneNumber());
consultantDetailDTO.setServeArea(source.getServeArea());
consultantDetailDTO.setCompanyAddress(source.getCompanyAddress());
- 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()));
+ consultantDetailDTO.setImg(source.getPhotoPath());
+ consultantDetailDTO.setExpertise(splitStringWithChar(source.getExpertise()));
+ consultantDetailDTO.setExperiences(source.getExperience());
- // todo 瘙箏����漲
- consultantDetailDTO.setSuitability(50);
+ // todo ��蝣箄�垣閰Ｗ漲銵函
consultantDetailDTO.setEvaluation(50);
return consultantDetailDTO;
--
Gitblit v1.8.0