From d7bcd8a8f81d85fe1524c4d785aaed58cd217586 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 03 十二月 2021 14:36:42 +0800
Subject: [PATCH] [update] 更新預約單API調整
---
pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 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..8108fc9 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
@@ -5,8 +5,7 @@
import java.util.Objects;
import java.util.stream.Collectors;
-import com.pollex.pam.enums.AppointmentStatusEnum;
-import com.pollex.pam.service.dto.AppointmentDTO;
+import com.pollex.pam.service.dto.AppointmentUpdateDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +59,28 @@
appointmentRepository.save(appointment);
}
+ public void updateAppointment(AppointmentUpdateDTO updateAppointmentDTO) {
+ Appointment appointment = appointmentRepository.findById(updateAppointmentDTO.getId()).get();
+
+ appointment.setPhone(updateAppointmentDTO.getPhone());
+ appointment.setEmail(updateAppointmentDTO.getEmail());
+ appointment.setContactType(updateAppointmentDTO.getContactType());
+ appointment.setGender(updateAppointmentDTO.getGender());
+ appointment.setAge(updateAppointmentDTO.getAge());
+ appointment.setJob(updateAppointmentDTO.getJob());
+ appointment.setRequirement(updateAppointmentDTO.getRequirement());
+ appointment.setHopeContactTime(updateAppointmentDTO.getHopeContactTime());
+ appointment.setOtherRequirement(updateAppointmentDTO.getOtherRequirement());
+
+ 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 +89,7 @@
Appointment appointment = appointmentRepository.findById(appointmentId).get();
appointment.setCommunicateStatus(ContactStatusEnum.CONTACTED);
+ appointment.setContactTime(Instant.now());
return appointmentRepository.save(appointment);
}
@@ -94,17 +116,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