From 7fcdb8eab75295661e4450614474e3c5a35bec94 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期四, 20 一月 2022 14:56:05 +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/AppointmentProcess.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/appointment/process/AppointmentProcess.java b/pamapi/src/main/java/com/pollex/pam/appointment/process/AppointmentProcess.java
index 979ebba..846287c 100644
--- a/pamapi/src/main/java/com/pollex/pam/appointment/process/AppointmentProcess.java
+++ b/pamapi/src/main/java/com/pollex/pam/appointment/process/AppointmentProcess.java
@@ -34,31 +34,23 @@
public void process(AbstractAppointmentProcessDTO dto) {
-// AbstractAppointmentProcessDTO appointmentProcessDTO = dto;
processList.stream().forEach(process ->{
if(process.getProcessType() == dto.getContactStatus()) {
- process.createProcess(dto);
+ Optional<AppointmentClosedInfo> closedInfoOP = appointmentClosedInfoRepository.findByAppointmentId(dto.getAppointmentId());
+ if(closedInfoOP.isPresent()) {
+ process.editClosedInfo(dto, closedInfoOP.get());
+ }else {
+ process.create(dto);
+ }
}
});
changeAppointmentCommunicateStatus(dto.getAppointmentId(), dto.getContactStatus());
-
}
private void changeAppointmentCommunicateStatus(Long appointmentId, ContactStatusEnum contactStatus) {
Appointment appointment = appointmentService.findById(appointmentId);
appointment.setCommunicateStatus(contactStatus);
- appointmentRepository.save(appointment);
- }
-
- public void editClosedInfo(AbstractAppointmentProcessDTO dto) {
- processList.stream().forEach(process ->{
- if(process.getProcessType() == dto.getContactStatus()) {
- process.editClosedInfo(dto);
- }
- });
- Appointment appointment = appointmentService.findById(dto.getAppointmentId());
- appointment.setCommunicateStatus(dto.getContactStatus());
appointmentRepository.save(appointment);
}
--
Gitblit v1.8.0