From 34b08e1c461f5e08675fcff95525956d7c4bef11 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:38:48 +0800
Subject: [PATCH] Merge branch 'Phase3' into pollex-dev
---
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 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..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
@@ -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;
}
@@ -48,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());
@@ -68,12 +64,11 @@
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);
+ // todo ��蝣箄�垣閰Ｗ漲銵函
consultantDetailDTO.setEvaluation(50);
return consultantDetailDTO;
--
Gitblit v1.8.0