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/Appointment.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 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 6e53c8e..76d30ca 100644
--- a/pamapi/src/main/java/com/pollex/pam/domain/Appointment.java
+++ b/pamapi/src/main/java/com/pollex/pam/domain/Appointment.java
@@ -2,14 +2,29 @@
import java.io.Serializable;
import java.time.Instant;
+import java.util.List;
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
-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;
+
+import com.pollex.pam.enums.AppointmentStatusEnum;
+import com.pollex.pam.enums.ContactStatusEnum;
@EntityListeners(AuditingEntityListener.class)
@Entity
@@ -61,6 +76,7 @@
private Instant appointmentDate = Instant.now();
@Column(name = "last_modified_date")
+ @LastModifiedDate
private Instant lastModifiedDate = Instant.now();
@Column(name = "agent_no")
@@ -81,6 +97,19 @@
@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;
+
+// @OneToOne(cascade = CascadeType.REMOVE,fetch=FetchType.EAGER)
+//// @JoinColumn(name = "form_authority_id", referencedColumnName = "id")
+// @JoinColumn(name = "appointment_id", referencedColumnName = "id")
+// private AppointmentClosedInfo closedInfo;
+
+// @OneToOne(cascade = CascadeType.REMOVE
+// , mappedBy = "appointment", fetch=FetchType.LAZY)
+// private AppointmentClosedInfo closedInfo;
public Long getId() {
return id;
@@ -233,4 +262,24 @@
public void setLastModifiedDate(Instant lastModifiedDate) {
this.lastModifiedDate = lastModifiedDate;
}
+
+ public List<AppointmentMemo> getAppointmentMemoList() {
+ return appointmentMemoList;
+ }
+
+ public void setAppointmentMemoList(List<AppointmentMemo> appointmentMemoList) {
+ this.appointmentMemoList = appointmentMemoList;
+ }
+
+// public AppointmentClosedInfo getClosedInfo() {
+// return closedInfo;
+// }
+//
+// public void setClosedInfo(AppointmentClosedInfo closedInfo) {
+// this.closedInfo = closedInfo;
+// }
+
+
+
+
}
--
Gitblit v1.8.0