From beeee55db98ec9028a3fcc6a05b844b04ba0c229 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期六, 22 一月 2022 10:39:16 +0800
Subject: [PATCH] [ADD] 新增小鈴鐺通知的紀錄( * 顧問主動發送滿意度給客戶的通知後，系統立即通知客戶需要填寫滿意度通知 * 顧問發送約訪通知後，系統通知客戶有約訪 * 顧問更新個人帳號通知 * 客戶取消預約單通知 * 客戶更新預約單通知 * 客戶進行滿意度評比通知)
---
pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 57 +++++++++++++++++++++++++--------------------------------
1 files changed, 25 insertions(+), 32 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..ca378b3 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
@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import com.pollex.pam.service.AppointmentService;
+import com.pollex.pam.service.PersonalNotificationService;
import com.pollex.pam.service.SatisfactionService;
import com.pollex.pam.service.dto.AppointmentCloseDTO;
import com.pollex.pam.service.dto.AppointmentCreateDTO;
@@ -35,10 +36,14 @@
@Autowired
AppointmentProcess abstractAppointmentProcess;
+
+ @Autowired
+ PersonalNotificationService personalNotificationService;
@PutMapping("")
- public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO appointment) {
- appointmentService.updateAppointment(appointment);
+ public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO dto) {
+ Appointment appointment = appointmentService.updateAppointment(dto);
+ personalNotificationService.createUpdateAppointmentToConsultant(appointment);
return ResponseEntity.noContent().build();
}
@@ -73,37 +78,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