From f5831acafe510f9a79f8e2ecf6dee09026d67fc6 Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期四, 20 一月 2022 16:09:09 +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 | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 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..a2f280e 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,28 @@
appointmentService.recordConsultantReadTime(appointmentId);
return ResponseEntity.noContent().build();
}
+
+ @PostMapping("/close")
+ public ResponseEntity<Void> closeAppointment(@RequestBody AppointmentCloseDTO closeDTO) {
+ appointmentService.closeAppointment(closeDTO);
+ return ResponseEntity.noContent().build();
+ }
+
+// @PostMapping("/close/info/edit")
+// public ResponseEntity<Void> editAppointmentClosedInfo(@RequestBody AppointmentCloseDTO closeDTO) {
+//
+// if(closeDTO.getContactStatus() == ContactStatusEnum.DONE) {
+// DoneProcessDTO dto = new DoneProcessDTO();
+// BeanUtils.copyProperties(closeDTO, dto);
+// abstractAppointmentProcess.editClosedInfo(dto);
+// }else if(closeDTO.getContactStatus() == ContactStatusEnum.CLOSED){
+// ClosedProcessDTO dto = new ClosedProcessDTO();
+// BeanUtils.copyProperties(closeDTO, dto);
+// abstractAppointmentProcess.editClosedInfo(dto);
+// }else {
+// return ResponseEntity.notFound().build();
+// }
+//
+// return ResponseEntity.noContent().build();
+// }
}
--
Gitblit v1.8.0