From 551d18a095e8fe462e4099fdd5b2578e12934d45 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 08 二月 2022 12:25:44 +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/ConsultantResource.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java
index 3af2eaf..64fb56e 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java
@@ -29,13 +29,19 @@
@Autowired
ConsultantService consultantService;
-
+
@Autowired
AppointmentService appointmentService;
@GetMapping("/favorite")
public ResponseEntity<List<CustomerFavoriteConsultantDTO>> getMyConsultantList() {
List<CustomerFavoriteConsultantDTO> myConsultants = consultantService.getMyConsultantList();
+ return new ResponseEntity<>(myConsultants, HttpStatus.OK);
+ }
+
+ @GetMapping("/all")
+ public ResponseEntity<List<ConsultantDTO>> getAllConsultantList() {
+ List<ConsultantDTO> myConsultants = consultantService.getAllConsultantList();
return new ResponseEntity<>(myConsultants, HttpStatus.OK);
}
@@ -63,13 +69,13 @@
return new ResponseEntity<>(HttpStatus.OK);
}
-
+ @Deprecated
@PostMapping("/strictQuery")
public ResponseEntity<List<ConsultantDTO>> strictQueryConsultant(@RequestBody StrictQueryConsultantParam param) {
List<ConsultantDTO> queryResult = consultantService.strictQueryConsultant(param);
return new ResponseEntity<>(queryResult, HttpStatus.OK);
}
-
+ @Deprecated
@PostMapping("/fastQuery")
public ResponseEntity<List<ConsultantDTO>> fastQueryConsultant(@RequestBody FastQueryConsultantParam param) {
List<ConsultantDTO> queryResult = consultantService.fastQueryConsultant(param);
@@ -102,8 +108,8 @@
}else {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
}
-
-
+
+
}
@PostMapping("/record/allAppointmentsView")
@@ -111,7 +117,7 @@
consultantService.recordAllAppointmentsView();
return ResponseEntity.noContent().build();
}
-
+
@PostMapping("/edit")
public ResponseEntity<Consultant> editConsultant(@RequestBody ConsultantEditDTO editDTO) {
if(!editDTO.getAgentNo().equals(SecurityUtils.getAgentNo())) {
@@ -120,7 +126,7 @@
Consultant editResult = consultantService.editConsultant(editDTO);
return new ResponseEntity<>(editResult, HttpStatus.OK);
}
-
+
@PostMapping("/sendSatisfactionToClient/{appointmentId}")
public ResponseEntity<Void> sendSatisfactionToClient(@PathVariable Long appointmentId) {
Appointment appointment = appointmentService.findById(appointmentId);
--
Gitblit v1.8.0