From 9136e0b88e812095e145ebae6ef2fcb0cb7e5c8a Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期五, 14 一月 2022 18:03:06 +0800
Subject: [PATCH] [ADD] 約訪通知新增欄位"預計約訪時間"

---
 pamapi/src/main/java/com/pollex/pam/service/mapper/AppointmentCustomerViewMapper.java |   17 ++++++++++++++++-
 1 files changed, 16 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..65dec36 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
@@ -5,18 +5,33 @@
 import java.util.List;
 
 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.AppointmentCustomerView;
+import com.pollex.pam.domain.AppointmentNoticeLog;
+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;
+	
+	@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);
 		return target;
 	}
 

--
Gitblit v1.8.0