From f4dd14d80b2a1565fabf835f8e05a8458b873ba8 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期三, 19 一月 2022 18:58:49 +0800
Subject: [PATCH] [BUG] 預約單結案未修改預約單最後溪改時間(todo : 134359)

---
 pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java |   15 +++++----------
 1 files changed, 5 insertions(+), 10 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 30e0e47..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,16 +1,11 @@
 package com.pollex.pam.service.mapper;
 
-import com.pollex.pam.domain.Appointment;
 import com.pollex.pam.domain.Consultant;
-import com.pollex.pam.domain.CustomerFavoriteConsultant;
-import com.pollex.pam.enums.ContactStatusEnum;
-import com.pollex.pam.service.AppointmentService;
 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.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -33,7 +28,6 @@
 
         consultantDTO.setContactStatus(null);
         consultantDTO.setUpdateTime(null);
-        consultantDTO.setLatestAppointmentId(null);
 
         return consultantDTO;
     }
@@ -50,13 +44,14 @@
 
         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());
@@ -68,9 +63,9 @@
         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()));
+        consultantDetailDTO.setImg(source.getPhotoPath());
+        consultantDetailDTO.setExpertise(splitStringWithChar(source.getExpertise()));
+        consultantDetailDTO.setExperiences(source.getExperience());
 
         // todo 瘙箏����漲
         consultantDetailDTO.setSuitability(50);

--
Gitblit v1.8.0