From fe99ba1caaebaa40c33ad1e3f1ee2c4dfd012795 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期一, 24 一月 2022 12:20:24 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://192.168.0.10:8443/r/pcalife/PAM into Phase3
---
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