From c4f664ac6ff3060b82ae8d2108ed07bbc3cf9222 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期三, 29 十二月 2021 12:31:04 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 53 +++++++++++++++++++++++++++++++----------------------
1 files changed, 31 insertions(+), 22 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 f1261e8..fd0ac35 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,40 +1,49 @@
package com.pollex.pam.service.mapper;
import com.pollex.pam.domain.Consultant;
-import com.pollex.pam.enums.ContactStatusEnum;
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.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 List<ConsultantDTO> toDto(List<Consultant> source) {
- return source.stream().map(this::toDto).collect(Collectors.toList());
+ public CustomerFavoriteConsultantDTO toCustomerFavoriteConsultantDto(Consultant source) {
+ CustomerFavoriteConsultantDTO consultantDTO = new CustomerFavoriteConsultantDTO();
+ 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());
+
+ consultantDTO.setContactStatus(null);
+ consultantDTO.setUpdateTime(null);
+
+ return consultantDTO;
}
- // todo convert
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());
-
- // todo
- consultantDTO.setImg("");
+ consultantDTO.setSeniority(source.getSeniorityDTOString());
consultantDTO.setExpertise(splitStringWithChar(source.getExpertise()));
- consultantDTO.setNewConsultant(false);
- consultantDTO.setContactStatus(ContactStatusEnum.CONTACTED);
- consultantDTO.setUpdateTime(Instant.now());
+ consultantDTO.setImg(source.getPhotoPath());
+ consultantDTO.setRole(source.getRole());
+
+ consultantDTO.setContactStatus(null);
+ consultantDTO.setUpdateTime(null);
+ consultantDTO.setLatestAppointmentId(null);
return consultantDTO;
}
@@ -49,17 +58,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.setExpertises(splitStringWithChar(source.getExpertise()));
+ consultantDetailDTO.setImg(source.getPhotoPath());
+ consultantDetailDTO.setExpertise(splitStringWithChar(source.getExpertise()));
consultantDetailDTO.setExperiences(splitStringWithChar(source.getExperience()));
+ // todo 瘙箏����漲
+ consultantDetailDTO.setSuitability(50);
+ consultantDetailDTO.setEvaluation(50);
+
return consultantDetailDTO;
}
--
Gitblit v1.8.0