From 5baaed06e6ef8f2bc29bf36bec6ed86a2f44e1cd Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 08 十一月 2021 09:19:40 +0800
Subject: [PATCH] [add] #todo 129741，我的清單、加入清單、快速篩選API
---
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 f1261e8..782e459 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,6 +1,7 @@
package com.pollex.pam.service.mapper;
import com.pollex.pam.domain.Consultant;
+import com.pollex.pam.domain.CustomFavoriteConsultant;
import com.pollex.pam.enums.ContactStatusEnum;
import com.pollex.pam.service.dto.ConsultantDTO;
import com.pollex.pam.service.dto.ConsultantDetailDTO;
@@ -17,10 +18,6 @@
private final static Character SPLIT_MASK = ',';
- public List<ConsultantDTO> toDto(List<Consultant> source) {
- return source.stream().map(this::toDto).collect(Collectors.toList());
- }
-
// todo convert
public ConsultantDTO toDto(Consultant source) {
ConsultantDTO consultantDTO = new ConsultantDTO();
@@ -28,17 +25,27 @@
consultantDTO.setName(source.getName());
consultantDTO.setAvgScore(source.getAvgScore());
consultantDTO.setSeniority(source.getSeniority());
+ consultantDTO.setExpertise(splitStringWithChar(source.getExpertise()));
// todo
consultantDTO.setImg("");
- consultantDTO.setExpertise(splitStringWithChar(source.getExpertise()));
- consultantDTO.setNewConsultant(false);
- consultantDTO.setContactStatus(ContactStatusEnum.CONTACTED);
- consultantDTO.setUpdateTime(Instant.now());
+ consultantDTO.setContactStatus(null);
+ consultantDTO.setUpdateTime(null);
return consultantDTO;
}
+ public ConsultantDTO toDto(CustomFavoriteConsultant customFavoriteConsultant) {
+ Consultant consultant = customFavoriteConsultant.getConsultant();
+ ConsultantDTO dto = toDto(consultant);
+
+ Instant updateTime = customFavoriteConsultant.getLastModifiedDate();
+ dto.setContactStatus(customFavoriteConsultant.getContactStatus());
+ dto.setUpdateTime(updateTime);
+
+ return dto;
+ }
+
public ConsultantDetailDTO toDetailDto(Consultant source) {
ConsultantDetailDTO consultantDetailDTO = new ConsultantDetailDTO();
consultantDetailDTO.setName(source.getName());
--
Gitblit v1.8.0