From 6576d44fb39c4875fa56eaa105956153bec3efd8 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 03 十二月 2021 11:36:30 +0800
Subject: [PATCH] Merge branch '個資同意'
---
pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
index bbaf4a1..f1785b9 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
@@ -60,6 +60,18 @@
appointmentRepository.save(appointment);
}
+ public void updateAppointment(AppointmentDTO appointmentDTO) {
+ Appointment appointment = appointmentDTOMapper.toAppointment(appointmentDTO);
+ appointment.setStatus(AVAILABLE);
+ appointmentRepository.save(appointment);
+ }
+
+ public void markAppointmentDeleted(Long appointmentId) {
+ Appointment appointment = appointmentRepository.findById(appointmentId).get();
+ appointment.setStatus(DELETED);
+ appointmentRepository.save(appointment);
+ }
+
public List<Appointment> findByAgentNo(String agentNo) {
return appointmentRepository.findByAgentNo(agentNo);
}
@@ -68,6 +80,7 @@
Appointment appointment = appointmentRepository.findById(appointmentId).get();
appointment.setCommunicateStatus(ContactStatusEnum.CONTACTED);
+ appointment.setContactTime(Instant.now());
return appointmentRepository.save(appointment);
}
@@ -94,17 +107,6 @@
else {
log.debug("this appointment was read, read time = {}", appointment.getConsultantReadTime());
}
- }
-
- public void updateAppointment(AppointmentDTO appointmentDTO) {
- Appointment appointment = appointmentDTOMapper.toAppointment(appointmentDTO);
- appointmentRepository.save(appointment);
- }
-
- public void markAppointmentDeleted(Long appointmentId) {
- Appointment appointment = appointmentRepository.findById(appointmentId).get();
- appointment.setStatus(DELETED);
- appointmentRepository.save(appointment);
}
public void recordAllAppointmentsView(String agentNo) {
--
Gitblit v1.8.0