From 73d2e2d19016e6c2a1164735b64d32eff1c91979 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期四, 13 一月 2022 09:16:27 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into Phase3
---
pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
index b65aa75..7a303c6 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
@@ -1,14 +1,22 @@
package com.pollex.pam.web.rest;
+import com.pollex.pam.appointment.process.AppointmentProcess;
import com.pollex.pam.domain.Appointment;
+import com.pollex.pam.enums.ContactStatusEnum;
import com.pollex.pam.service.SendMsgService;
import com.pollex.pam.service.dto.AppointmentUpdateDTO;
+import com.pollex.pam.service.dto.ClosedProcessDTO;
+import com.pollex.pam.service.dto.DoneProcessDTO;
+
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.pollex.pam.service.AppointmentService;
import com.pollex.pam.service.SatisfactionService;
+import com.pollex.pam.service.dto.AppointmentCloseDTO;
import com.pollex.pam.service.dto.AppointmentCreateDTO;
import com.pollex.pam.service.dto.AppointmentCustomerViewDTO;
@@ -24,6 +32,9 @@
@Autowired
SendMsgService sendMsgService;
+
+ @Autowired
+ AppointmentProcess abstractAppointmentProcess;
@PutMapping("")
public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO appointment) {
@@ -59,4 +70,24 @@
appointmentService.recordConsultantReadTime(appointmentId);
return ResponseEntity.noContent().build();
}
+
+ @PostMapping("/close")
+ public ResponseEntity<Void> closeAppointment(@RequestBody AppointmentCloseDTO closeDTO) {
+
+ if(closeDTO.getContactStatus() == ContactStatusEnum.DONE) {
+ DoneProcessDTO dto = new DoneProcessDTO();
+ BeanUtils.copyProperties(closeDTO, dto);
+ abstractAppointmentProcess.process(dto);
+ }else if(closeDTO.getContactStatus() == ContactStatusEnum.CLOSED){
+ ClosedProcessDTO dto = new ClosedProcessDTO();
+ BeanUtils.copyProperties(closeDTO, dto);
+ abstractAppointmentProcess.process(dto);
+ }
+
+// Appointment ap = appointmentService.findById(closeDTO.getAppointmentId());
+// System.out.println("getClosedInfo().getClosedOtherReason()::"+ap.getClosedInfo().getClosedOtherReason());
+
+
+ return ResponseEntity.noContent().build();
+ }
}
--
Gitblit v1.8.0