From d43c8dc4aff64ddcf2481e41274ff087ea03d920 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期三, 01 十二月 2021 15:01:47 +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 |   11 +++++------
 1 files changed, 5 insertions(+), 6 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 138c713..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
@@ -17,7 +17,7 @@
 @Service
 public class ConsultantMapper {
 
-    private final static Character SPLIT_MASK = ',';
+    private static final Character SPLIT_MASK = ',';
 
     @Autowired
     AppointmentService appointmentService;
@@ -27,7 +27,7 @@
         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());
@@ -72,17 +72,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.setExpertises(splitStringWithChar(source.getExpertise()));
+        consultantDetailDTO.setExperiences(splitStringWithChar(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