From 2f0e71d3d73b71cba5a0caebfdb9ba79722989c0 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期四, 27 一月 2022 14:54:38 +0800 Subject: [PATCH] [update] [todo 134826, 134662] 調整顧問資料格式、棄用搜尋並改將其功能改到前端算匹配度 --- pamapi/src/main/java/com/pollex/pam/service/mapper/AppointmentCustomerViewMapper.java | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/service/mapper/AppointmentCustomerViewMapper.java b/pamapi/src/main/java/com/pollex/pam/service/mapper/AppointmentCustomerViewMapper.java index 185103a..4389195 100644 --- a/pamapi/src/main/java/com/pollex/pam/service/mapper/AppointmentCustomerViewMapper.java +++ b/pamapi/src/main/java/com/pollex/pam/service/mapper/AppointmentCustomerViewMapper.java @@ -3,20 +3,49 @@ import static java.util.stream.Collectors.toList; import java.util.List; +import java.util.Optional; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.pollex.pam.domain.AppointmentClosedInfo; import com.pollex.pam.domain.AppointmentCustomerView; +import com.pollex.pam.domain.AppointmentNoticeLog; +import com.pollex.pam.repository.AppointmentClosedInfoRepository; +import com.pollex.pam.service.AppointmentClosedInfoService; +import com.pollex.pam.service.AppointmentNoticeLogService; +import com.pollex.pam.service.AppointmentService; import com.pollex.pam.service.dto.AppointmentCustomerViewDTO; -import com.pollex.pam.service.dto.AppointmentDTO; @Service public class AppointmentCustomerViewMapper { + @Autowired + AppointmentService appointmentService; + + @Autowired + AppointmentNoticeLogService appointmentNoticeLogService; + + @Autowired + AppointmentClosedInfoRepository appointmentClosedInfoRepository; + + @Transactional public AppointmentCustomerViewDTO toAppointmentCustomerViewDTO(AppointmentCustomerView source) { AppointmentCustomerViewDTO target = new AppointmentCustomerViewDTO(); BeanUtils.copyProperties(source, target); + target.setAppointmentMemoList(source.getAppointmentMemoList()); + appointmentService.setInterviewRecordDTO(target); + List<AppointmentNoticeLog> noticeLogs = appointmentNoticeLogService.findByAppointmentId(source.getId()); + target.setAppointmentNoticeLogs(noticeLogs); + Optional<AppointmentClosedInfo> appointmentClosedInfoOP = appointmentClosedInfoRepository + .findByAppointmentId(source.getId()); + if(appointmentClosedInfoOP.isPresent()) { + target.setAppointmentClosedInfo(appointmentClosedInfoOP.get()); + } + appointmentService.setSatisfactionScore(target, source.getId()); + return target; } -- Gitblit v1.8.0