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/web/rest/AppointmentResource.java | 48 ++++++++++++++++++------------------------------
1 files changed, 18 insertions(+), 30 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 dd2fc14..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
@@ -73,37 +73,25 @@
@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);
- }else {
- return ResponseEntity.notFound().build();
- }
-
+ 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();
- }
+// @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