From a500a222daca3829da3c187e7490840173b5b23b Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期四, 24 三月 2022 17:34:29 +0800
Subject: [PATCH] [ADD] 新增客戶取得自己所有預約單資料並且依照顧問group一起
---
pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 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 6a8e6b7..439213b 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,20 +1,26 @@
package com.pollex.pam.web.rest;
-import com.pollex.pam.appointment.process.AppointmentProcess;
-import com.pollex.pam.domain.Appointment;
-import com.pollex.pam.security.SecurityUtils;
-import com.pollex.pam.service.SendMsgService;
-import com.pollex.pam.service.dto.*;
+import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
+import com.pollex.pam.business.aop.logging.audit.AuditLoggingType;
+import com.pollex.pam.business.appointment.process.AppointmentProcess;
+import com.pollex.pam.business.domain.Appointment;
+import com.pollex.pam.business.security.SecurityUtils;
+import com.pollex.pam.business.service.SendMsgService;
-import com.pollex.pam.service.mapper.AppointmentMapper;
+import com.pollex.pam.business.service.dto.*;
+import com.pollex.pam.business.service.mapper.AppointmentMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
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.business.service.AppointmentService;
+import com.pollex.pam.business.service.PersonalNotificationService;
+import com.pollex.pam.business.service.SatisfactionService;
+
+import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.*;
+
+import java.util.List;
@RestController
@RequestMapping("/api/appointment")
@@ -38,6 +44,7 @@
@Autowired
PersonalNotificationService personalNotificationService;
+ @AuditLoggingInject(type = CUSTOMER_EDIT_APPOINTMENT)
@PutMapping("")
public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO dto) {
Appointment appointment = appointmentService.updateAppointment(dto);
@@ -45,12 +52,14 @@
return ResponseEntity.noContent().build();
}
+ @AuditLoggingInject(type = AuditLoggingType.CUSTOMER_CANCEL_APPOINTMENT)
@DeleteMapping("/{appointmentId}")
public ResponseEntity<Void> markAppointmentDeleted(@PathVariable Long appointmentId) {
appointmentService.markAppointmentDeleted(appointmentId);
return ResponseEntity.noContent().build();
}
+ @AuditLoggingInject(type = AuditLoggingType.CUSTOMER_CREATE_APPOINTMENT)
@PostMapping("/customer/create")
public AppointmentDTO clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO);
@@ -66,17 +75,20 @@
return appointmentService.getAppointmentDetail(appointmentId);
}
+ @AuditLoggingInject(type = CHECK_APPOINTMENT)
@GetMapping("/getDetail/{appointmentId}")
public AppointmentCustomerViewDTO getAppointmentDetail(@PathVariable Long appointmentId) {
return appointmentService.getAppointmentDetail(appointmentId);
}
+ @AuditLoggingInject(type = CONSULTANT_READ_APPOINTMENT)
@PostMapping("/recordRead/{appointmentId}")
public ResponseEntity<Void> recordConsultantReadAppointment(@PathVariable Long appointmentId) {
appointmentService.recordConsultantReadTime(appointmentId);
return ResponseEntity.noContent().build();
}
+ @AuditLoggingInject(type = APPOINTMENT_CLOSE)
@PostMapping("/close")
public ResponseEntity<Void> closeAppointment(@RequestBody AppointmentCloseDTO closeDTO) {
appointmentService.closeAppointment(closeDTO);
@@ -96,6 +108,11 @@
String agentNo = SecurityUtils.getAgentNo();
return new ResponseEntity<>(appointmentService.getConsultantPendingAppointmentSum(agentNo), HttpStatus.OK);
}
+
+ @GetMapping("/customer/get_all_group_by_consultant")
+ public List<CustomerFavoriteConsultantDTO> getCustomerAllAppointmentGroupByConsultant() {
+ return appointmentService.getCustomerAllAppointmentGroupByConsultant();
+ }
// @PostMapping("/close/info/edit")
// public ResponseEntity<Void> editAppointmentClosedInfo(@RequestBody AppointmentCloseDTO closeDTO) {
--
Gitblit v1.8.0