From fe4ee6fcbb9fba06a99302958583e7ccab29e614 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期五, 12 十一月 2021 16:18:45 +0800
Subject: [PATCH] add#129317: Add Date 過濾器
---
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 27 +++++++++++++++++----------
1 files changed, 17 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 f1261e8..4fce9ec 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,15 +25,25 @@
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) {
@@ -55,8 +62,8 @@
consultantDetailDTO.setAwards(source.getAward());
consultantDetailDTO.setImage("");
- consultantDetailDTO.setSuitability(0);
- consultantDetailDTO.setEvaluation(0);
+ consultantDetailDTO.setSuitability(50);
+ consultantDetailDTO.setEvaluation(50);
consultantDetailDTO.setExpertises(splitStringWithChar(source.getExpertise()));
consultantDetailDTO.setExperiences(splitStringWithChar(source.getExperience()));
--
Gitblit v1.8.0