From a3716f72066d25d745f4d5103ff23a553c3e102b Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:41:19 +0800
Subject: [PATCH] Merge branch 'sit' into uat

---
 pamapi/src/main/java/com/pollex/pam/domain/AppointmentCustomerView.java |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/pamapi/src/main/java/com/pollex/pam/domain/AppointmentCustomerView.java b/pamapi/src/main/java/com/pollex/pam/domain/AppointmentCustomerView.java
index da38baa..bb2a477 100644
--- a/pamapi/src/main/java/com/pollex/pam/domain/AppointmentCustomerView.java
+++ b/pamapi/src/main/java/com/pollex/pam/domain/AppointmentCustomerView.java
@@ -2,12 +2,17 @@
 
 import java.io.Serializable;
 import java.time.Instant;
+import java.util.List;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
 import com.pollex.pam.enums.AppointmentStatusEnum;
@@ -72,12 +77,22 @@
     @Column(name = "consultant_read_time")
     private Instant consultantReadTime;
 
+    @Column(name = "contact_time")
+    private Instant contactTime;
+
+    @Column(name = "last_modified_date")
+    private Instant lastModifiedDate;
+
     @Column(name = "name")
     private String name;
 
     @Enumerated(value = EnumType.STRING)
     @Column(name = "status")
     private AppointmentStatusEnum status;
+    
+    @JoinColumn(name = "appointment_id")
+    @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.REMOVE)
+    private List<AppointmentMemo> appointmentMemoList;
 
     public Long getId() {
         return id;
@@ -207,6 +222,14 @@
         this.consultantReadTime = consultantReadTime;
     }
 
+    public Instant getLastModifiedDate() {
+        return lastModifiedDate;
+    }
+
+    public void setLastModifiedDate(Instant lastModifiedDate) {
+        this.lastModifiedDate = lastModifiedDate;
+    }
+
     public String getName() {
 		return name;
 	}
@@ -215,6 +238,13 @@
 		this.name = name;
 	}
 
+    public Instant getContactTime() {
+        return contactTime;
+    }
+
+    public void setContactTime(Instant markCommunicateTime) {
+        this.contactTime = markCommunicateTime;
+    }
     public AppointmentStatusEnum getStatus() {
         return status;
     }
@@ -222,4 +252,14 @@
     public void setStatus(AppointmentStatusEnum status) {
         this.status = status;
     }
+
+	public List<AppointmentMemo> getAppointmentMemoList() {
+		return appointmentMemoList;
+	}
+
+	public void setAppointmentMemoList(List<AppointmentMemo> appointmentMemoList) {
+		this.appointmentMemoList = appointmentMemoList;
+	}
+    
+    
 }

--
Gitblit v1.8.0