From 2ad11fa39ac42b17dc1b34b01788322855fa2e3e Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 13 十二月 2021 12:16:11 +0800
Subject: [PATCH] [update] 【todo 132231】修正顧問清單的更新時間在有預約單刪除後應為刪除時間
---
pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 0730d6d..5b5cb33 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
@@ -3,6 +3,7 @@
import java.time.Instant;
import java.util.List;
import java.util.Objects;
+import java.util.Optional;
import java.util.stream.Collectors;
import com.pollex.pam.domain.Satisfaction;
@@ -72,6 +73,7 @@
appointment.setRequirement(updateAppointmentDTO.getRequirement());
appointment.setHopeContactTime(updateAppointmentDTO.getHopeContactTime());
appointment.setOtherRequirement(updateAppointmentDTO.getOtherRequirement());
+ appointment.setLastModifiedDate(Instant.now());
appointmentRepository.save(appointment);
}
@@ -79,6 +81,7 @@
public void markAppointmentDeleted(Long appointmentId) {
Appointment appointment = appointmentRepository.findById(appointmentId).get();
appointment.setStatus(DELETED);
+ appointment.setLastModifiedDate(Instant.now());
appointmentRepository.save(appointment);
}
@@ -87,11 +90,11 @@
}
public Appointment markAsContacted(Long appointmentId) {
-
Appointment appointment = appointmentRepository.findById(appointmentId).get();
appointment.setCommunicateStatus(ContactStatusEnum.CONTACTED);
appointment.setContactTime(Instant.now());
- return appointmentRepository.save(appointment);
+ appointment.setLastModifiedDate(Instant.now());
+ return appointmentRepository.save(appointment);
}
public AppointmentCustomerViewDTO getAppointmentDetail(Long appointmentId) {
@@ -127,6 +130,10 @@
.collect(Collectors.toList());
}
+ public Optional<Appointment> findLatestAppointmentByAgentNoAndCustomerId(String agentNo, Long customerId) {
+ return appointmentRepository.findTopByAgentNoAndCustomerIdOrderByAppointmentDateDesc(agentNo, customerId);
+ }
+
public void recordConsultantReadTime(Long appointmentId) {
Appointment appointment = appointmentRepository.findById(appointmentId).get();
--
Gitblit v1.8.0