From ac594e4efb30ba28776d74b0fb08ab34d7c32023 Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期四, 30 十二月 2021 15:20:08 +0800
Subject: [PATCH] Merge branch 'Phase2'
---
pamapi/src/main/java/com/pollex/pam/domain/Appointment.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/domain/Appointment.java b/pamapi/src/main/java/com/pollex/pam/domain/Appointment.java
index 6dda636..6dbf168 100644
--- a/pamapi/src/main/java/com/pollex/pam/domain/Appointment.java
+++ b/pamapi/src/main/java/com/pollex/pam/domain/Appointment.java
@@ -2,10 +2,13 @@
import java.io.Serializable;
import java.time.Instant;
+import java.util.List;
import javax.persistence.*;
+import com.pollex.pam.enums.AppointmentStatusEnum;
import com.pollex.pam.enums.ContactStatusEnum;
+import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -54,9 +57,12 @@
@Column(name = "other_requirement")
private String otherRequirement;
- @LastModifiedDate
- @Column(name = "appointment_date")
- private Instant appointmentDate;
+ @CreatedDate
+ @Column(name = "appointment_date", updatable = false)
+ private Instant appointmentDate = Instant.now();
+
+ @Column(name = "last_modified_date")
+ private Instant lastModifiedDate = Instant.now();
@Column(name = "agent_no")
private String agentNo;
@@ -69,6 +75,17 @@
@Column(name = "consultant_read_time")
private Instant consultantReadTime;
+
+ @Column(name = "contact_time")
+ private Instant contactTime;
+
+ @Enumerated(value = EnumType.STRING)
+ @Column(name = "status")
+ private AppointmentStatusEnum status;
+
+ @JoinColumn(name = "appointment_id")
+ @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
+ private List<AppointmentMemo> appointmentMemoList;
public Long getId() {
return id;
@@ -197,4 +214,40 @@
public void setConsultantReadTime(Instant consultantReadTime) {
this.consultantReadTime = consultantReadTime;
}
+
+ public Instant getContactTime() {
+ return contactTime;
+ }
+
+ public void setContactTime(Instant markCommunicateTime) {
+ this.contactTime = markCommunicateTime;
+ }
+
+ public AppointmentStatusEnum getStatus() {
+ return status;
+ }
+
+ public void setStatus(AppointmentStatusEnum status) {
+ this.status = status;
+ }
+
+ public Instant getLastModifiedDate() {
+ return lastModifiedDate;
+ }
+
+ public void setLastModifiedDate(Instant lastModifiedDate) {
+ this.lastModifiedDate = lastModifiedDate;
+ }
+
+ public List<AppointmentMemo> getAppointmentMemoList() {
+ return appointmentMemoList;
+ }
+
+ public void setAppointmentMemoList(List<AppointmentMemo> appointmentMemoList) {
+ this.appointmentMemoList = appointmentMemoList;
+ }
+
+
+
+
}
--
Gitblit v1.8.0