From 6dd264601727f2e7ae70e5caa99f137fdad6546c Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 30 十一月 2021 19:45:31 +0800
Subject: [PATCH] [add] 【todo 131189】新增嚴選配對年資篩選功能

---
 pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 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 954d1c6..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
@@ -8,6 +8,7 @@
 import com.pollex.pam.service.dto.ConsultantDTO;
 import com.pollex.pam.service.dto.ConsultantDetailDTO;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -16,20 +17,17 @@
 @Service
 public class ConsultantMapper {
 
-    private final static Character SPLIT_MASK = ',';
+    private static final Character SPLIT_MASK = ',';
 
-    private final AppointmentService appointmentService;
-
-    public ConsultantMapper(AppointmentService appointmentService) {
-        this.appointmentService = appointmentService;
-    }
+    @Autowired
+    AppointmentService appointmentService;
 
     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());
+        consultantDTO.setSeniority(source.getSeniorityDTOString());
         consultantDTO.setExpertise(splitStringWithChar(source.getExpertise()));
         consultantDTO.setImg(source.getPhotoPath());
         consultantDTO.setRole(source.getRole());
@@ -74,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