From 4394e4248455637ab7836756058ac872fdf4af10 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:39:43 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 6ac1d5f..6a8e6b7 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
@@ -4,8 +4,9 @@
import com.pollex.pam.domain.Appointment;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.SendMsgService;
-import com.pollex.pam.service.dto.AppointmentUpdateDTO;
+import com.pollex.pam.service.dto.*;
+import com.pollex.pam.service.mapper.AppointmentMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -14,11 +15,6 @@
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;
-import com.pollex.pam.service.dto.AppointmentCustomerViewDTO;
-
-import java.util.Objects;
@RestController
@RequestMapping("/api/appointment")
@@ -26,6 +22,9 @@
@Autowired
AppointmentService appointmentService;
+
+ @Autowired
+ AppointmentMapper appointmentMapper;
@Autowired
SatisfactionService satisfactionService;
@@ -53,9 +52,12 @@
}
@PostMapping("/customer/create")
- public void clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
+ public AppointmentDTO clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO);
appointmentService.sendAppointmentNotify(appointment);
+ satisfactionService.createUnfilledSystemSatisfaction(appointment);
+
+ return appointmentMapper.toAppointmentDTO(appointment);
}
@PostMapping("/markAsContacted/{appointmentId}")
--
Gitblit v1.8.0