From 83fdf8582cd37b0603dba3f4d0a869453722e292 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 29 十一月 2021 12:03:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 77f770e..7924090 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,5 +1,6 @@
package com.pollex.pam.web.rest;
+import com.pollex.pam.service.ConsultantService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -8,25 +9,32 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import com.pollex.pam.domain.AppointmentCustomerView;
import com.pollex.pam.service.AppointmentService;
import com.pollex.pam.service.dto.AppointmentCreateDTO;
+import com.pollex.pam.service.dto.AppointmentCustomerViewDTO;
@RestController
@RequestMapping("/api/appointment")
public class AppointmentResource {
-
+
@Autowired
AppointmentService appointmentService;
-
+
@PostMapping("/customer/create")
public void clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
appointmentService.customerCreateAppointment(appointmentCreateDTO);
}
- @PostMapping("/markAsContacted")
- public void markAsContacted(@RequestBody Long appointmentId) {
+ @PostMapping("/markAsContacted/{appointmentId}")
+ public void markAsContacted(@PathVariable Long appointmentId) {
appointmentService.markAsContacted(appointmentId);
}
+ @GetMapping("/getDetail/{appointmentId}")
+ public AppointmentCustomerViewDTO getAppointmentDetail(@PathVariable Long appointmentId) {
+ return appointmentService.getAppointmentDetail(appointmentId);
+ }
+
}
--
Gitblit v1.8.0