From 4394e4248455637ab7836756058ac872fdf4af10 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:39:43 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 fd0ac35..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
@@ -5,6 +5,7 @@
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.util.*;
@@ -41,15 +42,17 @@
consultantDTO.setImg(source.getPhotoPath());
consultantDTO.setRole(source.getRole());
+ consultantDTO.setSuitability(0);
consultantDTO.setContactStatus(null);
consultantDTO.setUpdateTime(null);
- consultantDTO.setLatestAppointmentId(null);
+// consultantDTO.setLatestAppointmentId(null);
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());
@@ -63,10 +66,9 @@
consultantDetailDTO.setAwards(source.getAward());
consultantDetailDTO.setImg(source.getPhotoPath());
consultantDetailDTO.setExpertise(splitStringWithChar(source.getExpertise()));
- consultantDetailDTO.setExperiences(splitStringWithChar(source.getExperience()));
+ consultantDetailDTO.setExperiences(source.getExperience());
- // todo 瘙箏����漲
- consultantDetailDTO.setSuitability(50);
+ // todo ��蝣箄�垣閰Ｗ漲銵函
consultantDetailDTO.setEvaluation(50);
return consultantDetailDTO;
--
Gitblit v1.8.0