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/doc/預約單/顧問取得所有自己的預約單API.txt |  185 ++++++++++++---------------------------------
 1 files changed, 50 insertions(+), 135 deletions(-)

diff --git "a/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\351\241\247\345\225\217\345\217\226\345\276\227\346\211\200\346\234\211\350\207\252\345\267\261\347\232\204\351\240\220\347\264\204\345\226\256API.txt" "b/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\351\241\247\345\225\217\345\217\226\345\276\227\346\211\200\346\234\211\350\207\252\345\267\261\347\232\204\351\240\220\347\264\204\345\226\256API.txt"
index 24949fd..8802bb4 100644
--- "a/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\351\241\247\345\225\217\345\217\226\345\276\227\346\211\200\346\234\211\350\207\252\345\267\261\347\232\204\351\240\220\347\264\204\345\226\256API.txt"
+++ "b/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\351\241\247\345\225\217\345\217\226\345\276\227\346\211\200\346\234\211\350\207\252\345\267\261\347\232\204\351\240\220\347\264\204\345\226\256API.txt"
@@ -2,139 +2,54 @@
 
 http://localhost:8080/api/consultant/getMyAppointment
 
+appointmentMemoList : ��酉鞈��
 
-
-[
-    {
-        "id": 110,
-        "phone": "09123456789",
-        "email": "",
-        "contactType": "mobile",
-        "gender": "male",
-        "age": "30",
-        "job": "��",
-        "requirement": "摮戊��,鞈閬��,��靽����",
-        "communicateStatus": "contacted",
-        "hopeContactTime": "'蝳格���,蝳格����12:00~14:00,14:00~18:00'",
-        "otherRequirement": null,
-        "appointmentDate": "2021-12-02T09:58:58.932Z",
-        "lastModifiedDate": "2021-12-02T09:58:58.932Z",
-        "agentNo": "AG0109051204",
-        "customerId": 70,
-        "name": null,
-        "consultantViewTime": "2021-12-02T09:58:12.066Z",
-        "consultantReadTime": "2021-12-02T09:58:58.930Z",
-        "contactTime": "2021-12-02T09:58:58.930Z",
-        "satisfactionScore":3 // null 隞�銵刻府蝑��撠憛怠神皛踵�漲
-    },
-    {
-        "id": 109,
-        "phone": "09123456789",
-        "email": "",
-        "contactType": "mobile",
-        "gender": "male",
-        "age": "20",
-        "job": "��",
-        "requirement": "�摨瑁����,摮戊��,靽�瑼�/閬��,��靽����",
-        "communicateStatus": "contacted",
-        "hopeContactTime": "'蝳格��,蝳格���,蝳格���,蝳格���,蝳格���,蝳格�,蝳格���12:00~14:00,14:00~18:00'",
-        "otherRequirement": null,
-        "appointmentDate": "2021-12-02T10:12:24.613Z",
-        "lastModifiedDate": "2021-12-02T10:12:24.613Z",
-        "agentNo": "AG0109051204",
-        "customerId": 67,
-        "name": null,
-        "consultantViewTime": "2021-12-02T09:58:12.066Z",
-        "consultantReadTime": "2021-12-02T10:12:24.612Z",
-        "contactTime": null,
-        "satisfactionScore":3 // null 隞�銵刻府蝑��撠憛怠神皛踵�漲
-    },
-    {
-        "id": 114,
-        "phone": "09123456789",
-        "email": "",
-        "contactType": "mobile",
-        "gender": "male",
-        "age": "70",
-        "job": "��",
-        "requirement": "�摨瑁����,摮戊��,鞈閬��,璅暑��隡�,��靽����",
-        "communicateStatus": "contacted",
-        "hopeContactTime": "'蝳格��,蝳格���,蝳格���,蝳格���,蝳格���,蝳格�,蝳格���12:00~14:00,14:00~18:00'",
-        "otherRequirement": null,
-        "appointmentDate": "2021-12-02T09:58:12.248Z",
-        "lastModifiedDate": "2021-12-02T09:58:12.248Z",
-        "agentNo": "AG0109051204",
-        "customerId": 71,
-        "name": null,
-        "consultantViewTime": "2021-12-02T09:58:12.066Z",
-        "consultantReadTime": null,
-        "contactTime": null,
-        "satisfactionScore":3 // null 隞�銵刻府蝑��撠憛怠神皛踵�漲
-    },
-    {
-        "id": 121,
-        "phone": "09123456789",
-        "email": "",
-        "contactType": "mobile",
-        "gender": "male",
-        "age": "20",
-        "job": "��",
-        "requirement": "摮戊��",
-        "communicateStatus": "contacted",
-        "hopeContactTime": "'蝳格��,蝳格���,蝳格���,蝳格���,蝳格���,蝳格�,蝳格���9:00~12:00,12:00~14:00,14:00~18:00,18:00~21:00'",
-        "otherRequirement": null,
-        "appointmentDate": "2021-12-02T09:58:12.248Z",
-        "lastModifiedDate": "2021-12-02T09:58:12.248Z",
-        "agentNo": "AG0109051204",
-        "customerId": 76,
-        "name": "��蝬�",
-        "consultantViewTime": "2021-12-02T09:58:12.066Z",
-        "consultantReadTime": "2021-12-02T09:54:20.872Z",
-        "contactTime": null,
-        "satisfactionScore":3 // null 隞�銵刻府蝑��撠憛怠神皛踵�漲
-    },
-    {
-        "id": 118,
-        "phone": "09123456789",
-        "email": "",
-        "contactType": "mobile",
-        "gender": "male",
-        "age": "20",
-        "job": "��",
-        "requirement": "�摨瑁����",
-        "communicateStatus": "contacted",
-        "hopeContactTime": "'蝳格��,蝳格���,蝳格���,蝳格���,蝳格���,蝳格�,蝳格���12:00~14:00,14:00~18:00'",
-        "otherRequirement": null,
-        "appointmentDate": "2021-12-02T10:02:52.797Z",
-        "lastModifiedDate": "2021-12-02T10:02:52.797Z",
-        "agentNo": "AG0109051204",
-        "customerId": 72,
-        "name": null,
-        "consultantViewTime": "2021-12-02T09:58:12.066Z",
-        "consultantReadTime": "2021-12-02T10:02:52.796Z",
-        "contactTime": null,
-        "satisfactionScore":3 // null 隞�銵刻府蝑��撠憛怠神皛踵�漲
-    },
-    {
-        "id": 180,
-        "phone": "0911111111",
-        "email": "",
-        "contactType": "phone",
-        "gender": "female",
-        "age": "31-40",
-        "job": "��",
-        "requirement": "摮戊��,�摨瑁����",
-        "communicateStatus": "contacted",
-        "hopeContactTime": "'蝳格���,蝳格���,蝳格���,蝳格���,蝳格���9:00~12:00,12:00~14:00,14:00~18:00,18:00~21:00','蝳格��,蝳格���,蝳格���,蝳格���,蝳格���,蝳格���12:00~14:00,14:00~18:00,18:00~21:00','蝳格��,蝳格���,蝳格�,蝳格���14:00~18:00,18:00~21:00'",
-        "otherRequirement": null,
-        "appointmentDate": "2021-12-02T10:10:53.341Z",
-        "lastModifiedDate": "2021-12-03T03:40:16.344Z",
-        "agentNo": "AG0109051204",
-        "customerId": 77,
-        "name": "111",
-        "consultantViewTime": "2021-12-02T10:10:46.358Z",
-        "consultantReadTime": "2021-12-02T10:10:53.340Z",
-        "contactTime": "2021-12-03T03:40:16.215Z",
-        "satisfactionScore":3 // null 隞�銵刻府蝑��撠憛怠神皛踵�漲
-    }
-]
+[ {
+  "id" : 435,
+  "phone" : "0973057067",
+  "email" : "",
+  "contactType" : "phone",
+  "gender" : "male",
+  "age" : "under_20",
+  "job" : "憭",
+  "requirement" : "�摨瑁����",
+  "communicateStatus" : "reserved",
+  "hopeContactTime" : "'����,�����,�����,�����,�����,���,�����9:00~12:00,12:00~14:00,14:00~18:00,18:00~21:00'",
+  "otherRequirement" : null,
+  "appointmentDate" : "2021-12-29T09:33:16.643Z",
+  "lastModifiedDate" : "2021-12-29T09:33:16.637Z",
+  "agentNo" : "A568420",
+  "customerId" : 90,
+  "name" : "Jack",
+  "consultantViewTime" : "2021-12-29T09:33:49.547Z",
+  "consultantReadTime" : null,
+  "contactTime" : null,
+  "satisfactionScore" : null,
+  "appointmentMemoList" : [ ]
+}, {
+  "id" : 385,
+  "phone" : "0911223344",
+  "email" : "SDD",
+  "contactType" : "phone",
+  "gender" : "female",
+  "age" : "21-30",
+  "job" : "��",
+  "requirement" : "�摨瑁����",
+  "communicateStatus" : "reserved",
+  "hopeContactTime" : "'����,�����,�����,�����,�����,���,�����9:00~12:00,12:00~14:00,14:00~18:00,18:00~21:00'",
+  "otherRequirement" : null,
+  "appointmentDate" : "2021-12-16T07:11:05.400Z",
+  "lastModifiedDate" : "2021-12-16T07:11:05.399Z",
+  "agentNo" : "A568420",
+  "customerId" : 139,
+  "name" : "Angula-test",
+  "consultantViewTime" : "2021-12-27T02:02:18.711Z",
+  "consultantReadTime" : "2021-12-29T09:14:24.209Z",
+  "contactTime" : null,
+  "satisfactionScore" : null,
+  "appointmentMemoList" : [ {
+    "id" : 2,
+    "content" : "test4",
+    "appointmentId" : 385
+  } ]
+} ]

--
Gitblit v1.8.0