From 6fa4bba623713c396432ba8b863846883d6a1906 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 26 一月 2022 10:52:23 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit

---
 PAMapp/shared/models/appointment.model.ts |  143 +++++++++++++++++++++++++++++------------------
 1 files changed, 88 insertions(+), 55 deletions(-)

diff --git a/PAMapp/shared/models/appointment.model.ts b/PAMapp/shared/models/appointment.model.ts
index c6b5d13..9a66ebe 100644
--- a/PAMapp/shared/models/appointment.model.ts
+++ b/PAMapp/shared/models/appointment.model.ts
@@ -1,46 +1,62 @@
 import { ContactStatus } from "./enum/contact-status";
 
 export interface AppointmentLog {
-    id              : number;
-    createdDate     : string;
-    lastModifiedDate: string;
-    customerId      : number;
-    agentNo         : string;
-    status          : 'UNFILLED' | 'FILLED';
-    score           : number;
     agentName       : string;
+    agentNo         : string;
+    appointmentId   : number;
+    createdDate     : string;
+    customerId      : number;
     customerName    : string;
+    id              : number;
+    lastModifiedDate: string;
+    score           : number;
+    status          : 'UNFILLED' | 'FILLED';
 }
+
 export interface Appointment {
-  age                : string;
-  agentNo            : string;
-  appointmentDate    : string;
-  appointmentMemoList: AppointmentMemoInfo[]
-  communicateStatus  : string;
-  consultantReadTime : string;
-  consultantViewTime : string;
-  contactTime        : string;
-  contactType        : string;
-  customerId         : number;
-  email              : string;
-  gender             : string;
-  hopeContactTime    : string;
-  id                 : number;
-  interviewRecordDTOs: InterviewRecord[];
-  job                : string;
-  lastModifiedDate   : string;
-  name               : string;
-  otherRequirement   : string;
-  phone              : string;
-  requirement        : string;
-  satisfactionScore  : number;
+  age                  : string;
+  agentNo              : string;
+  appointmentClosedInfo: AppointmentClosedInfo;
+  appointmentDate      : string;
+  appointmentMemoList  : AppointmentMemoInfo[]
+  appointmentNoticeLogs: NoticeLogs[];
+  communicateStatus    : ContactStatus;
+  consultantReadTime   : string;
+  consultantViewTime   : string;
+  contactTime          : string;
+  contactType          : string;
+  customerId           : number;
+  email                : string;
+  gender               : string;
+  hopeContactTime      : string;
+  id                   : number;
+  interviewRecordDTOs  : InterviewRecord[];
+  job                  : string;
+  lastModifiedDate     : string;
+  name                 : string;
+  otherRequirement     : string;
+  phone                : string;
+  requirement          : string;
+  satisfactionScore    : number;
 };
+
+export interface AppointmentClosedInfo {
+  appointmentId         : number;
+  closedOtherReason     : string;
+  closedReason          : string;
+  id                    : number;
+  planCode              : string;
+  policyEntryDate       : string;
+  policyholderIdentityId: string;
+  remark                : string;
+}
 
 export interface AppointmentMemoInfo {
   appointmentId: number;
   content      : string;
   id           : number;
 }
+
 export interface InterviewRecord {
   appointmentId   : number;
   content         : string;
@@ -51,6 +67,16 @@
   lastModifiedBy  : string;
   lastModifiedDate: string;
 }
+
+export interface NoticeLogs {
+  appointmentId: number,
+  content      : string,
+  createdDate  : string
+  email        : string,
+  id           : number,
+  phone        : string,
+}
+
 export interface AppointmentWithConsultantInfo extends Appointment {
   consultantAvatar    : string;
   consultantExpertList: string[];
@@ -59,30 +85,6 @@
   updateTime          : string;
 }
 
-export interface AppointmentDetail {
-  age                 : string;
-  agentNo             : string;
-  appointmentDate     : string;
-  appointmentMemoList?: string[];
-  communicateStatus   : string;
-  consultantReadTime  : string;
-  consultantViewTime  : string;
-  contactTime         : string;
-  contactType         : string;
-  customerId          : number;
-  email               : string;
-  gender              : string;
-  hopeContactTime     : string;
-  id                  : number;
-  interviewRecordDTOs : string[];
-  job                 : string;
-  lastModifiedDate    : string;
-  name                : string;
-  otherRequirement    : string;
-  phone               : string;
-  requirement         : string;
-  satisfactionScore?  : number;
-}
 export interface AppointmentParams {
   age            : string;
   agentNo        : string;
@@ -94,6 +96,7 @@
   phone          : string;
   requirement    : string;
 }
+
 export interface EditAppointmentParams {
   age             : string;
   contactType     : string;
@@ -106,6 +109,7 @@
   phone           : string;
   requirement     : string;
 }
+
 export interface AppointmentRequests {
   age            : string;
   agentNo        : string;
@@ -117,11 +121,11 @@
   phone          : string;
   requirement    : string[];
 }
+
 export interface ContactTime {
   selectTimesOptions: string[];
   selectWeekOptions : string[];
 }
-
 
 export interface createdMemoInfo {
   appointmentId: number;
@@ -139,6 +143,7 @@
     planCode              : string;
     policyEntryDate       : string;
     policyholderIdentityId: string;
+    remark?               : string;
 }
 
 export interface ToCloseAppointment {
@@ -146,6 +151,34 @@
   closedOtherReason: string;
   closedReason     : string;
   contactStatus    : ContactStatus;
-  remark           : string;
+  remark?          : string;
 }
 
+export interface NoticeLogs {
+  appointmentId: number;
+  content      : string;
+  createdDate  : string;
+  email        : string;
+  id           : number;
+  interviewDate: string;
+  phone        : string;
+}
+
+export interface ToInformAppointment {
+  appointmentId: number;
+  email        : string;
+  interviewDate: string;
+  message      : string;
+  phone        : string;
+}
+
+export interface InterviewRecordInfo {
+  content: string;
+  interviewDate: string;
+  appointmentId: number;
+}
+
+export interface UpdateInterviewRecordInfo {
+  /** interviewRecord id */
+  id: number;
+}

--
Gitblit v1.8.0