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/appointment/process/ClosedProcess.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/appointment/process/ClosedProcess.java b/pamapi/src/main/java/com/pollex/pam/appointment/process/ClosedProcess.java
index 8d728c5..b6c70ce 100644
--- a/pamapi/src/main/java/com/pollex/pam/appointment/process/ClosedProcess.java
+++ b/pamapi/src/main/java/com/pollex/pam/appointment/process/ClosedProcess.java
@@ -3,27 +3,48 @@
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.Appointment;
import com.pollex.pam.domain.AppointmentClosedInfo;
import com.pollex.pam.enums.ContactStatusEnum;
import com.pollex.pam.repository.AppointmentClosedInfoRepository;
+import com.pollex.pam.service.AppointmentClosedInfoService;
+import com.pollex.pam.service.AppointmentService;
+import com.pollex.pam.service.SatisfactionService;
import com.pollex.pam.service.dto.AbstractAppointmentProcessDTO;
import com.pollex.pam.service.dto.ClosedProcessDTO;
-import com.pollex.pam.service.dto.DoneProcessDTO;
@Service
+@Transactional
public class ClosedProcess implements AppointmentProcessInterface{
@Autowired
AppointmentClosedInfoRepository appointmentClosedInfoRepository;
-
+
+ @Autowired
+ AppointmentService appointmentService;
+
+ @Autowired
+ AppointmentClosedInfoService appointmentClosedInfoService;
+
+ @Autowired
+ SatisfactionService satisfactionService;
+
@Override
- public void doProcess(AbstractAppointmentProcessDTO processDTO) {
- ClosedProcessDTO doneProcess = (ClosedProcessDTO)processDTO;
- BeanUtils.copyProperties(processDTO, doneProcess);
+ public AppointmentClosedInfo create(AbstractAppointmentProcessDTO processDTO) {
+ ClosedProcessDTO closeProcess = toClosedProcessDTO(processDTO);
AppointmentClosedInfo closedInfo = new AppointmentClosedInfo();
- BeanUtils.copyProperties(doneProcess, closedInfo);
- appointmentClosedInfoRepository.save(closedInfo);
+ BeanUtils.copyProperties(closeProcess, closedInfo);
+ Appointment appointment = appointmentService.findById(processDTO.getAppointmentId());
+ satisfactionService.createSatisfaction(appointment);
+ return appointmentClosedInfoRepository.save(closedInfo);
+ }
+
+ private ClosedProcessDTO toClosedProcessDTO(AbstractAppointmentProcessDTO processDTO) {
+ ClosedProcessDTO closeProcess = (ClosedProcessDTO)processDTO;
+ BeanUtils.copyProperties(processDTO, closeProcess);
+ return closeProcess;
}
@Override
@@ -31,5 +52,14 @@
return ContactStatusEnum.CLOSED;
}
+ @Override
+ public AppointmentClosedInfo editClosedInfo(
+ AbstractAppointmentProcessDTO abstractDTO
+ , AppointmentClosedInfo closedInfo) {
+ ClosedProcessDTO closeProcess = toClosedProcessDTO(abstractDTO);
+ BeanUtils.copyProperties(closeProcess, closedInfo);
+ return appointmentClosedInfoRepository.save(closedInfo);
+ }
+
}
--
Gitblit v1.8.0