From ac594e4efb30ba28776d74b0fb08ab34d7c32023 Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期四, 30 十二月 2021 15:20:08 +0800
Subject: [PATCH] Merge branch 'Phase2'
---
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 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 5ad63d7..275d246 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,30 +1,30 @@
package com.pollex.pam.service.mapper;
import com.pollex.pam.domain.Consultant;
-import com.pollex.pam.domain.CustomFavoriteConsultant;
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.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 = ',';
- 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);
@@ -32,19 +32,26 @@
return consultantDTO;
}
- public ConsultantDTO toDto(CustomFavoriteConsultant customFavoriteConsultant) {
- Consultant consultant = customFavoriteConsultant.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());
- Instant updateTime = customFavoriteConsultant.getLastModifiedDate();
- dto.setContactStatus(customFavoriteConsultant.getContactStatus());
- dto.setUpdateTime(updateTime);
+ consultantDTO.setContactStatus(null);
+ consultantDTO.setUpdateTime(null);
+// consultantDTO.setLatestAppointmentId(null);
- 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());
@@ -53,17 +60,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.setImg(source.getPhotoPath());
+ consultantDetailDTO.setExpertise(splitStringWithChar(source.getExpertise()));
+ consultantDetailDTO.setExperiences(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