From 4637ca54f1d51b0fc17b1955022f1c59ab70cbee Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期三, 10 十一月 2021 17:48:34 +0800
Subject: [PATCH] [UPDATE] 調整appointment age欄位型態
---
pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentCreateDTO.java | 6 +-
pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentCustomerViewDTO.java | 6 +-
pamapi/src/doc/預約單/預約前詢問.txt | 2
pamapi/src/main/java/com/pollex/pam/domain/AppointmentCustomerView.java | 6 +-
pamapi/src/doc/預約單/顧問取得所有自己的預約單API | 39 ++++++++++++++++++-
pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentDTO.java | 6 +-
pamapi/src/main/java/com/pollex/pam/domain/Appointment.java | 6 +-
7 files changed, 52 insertions(+), 19 deletions(-)
diff --git "a/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\351\240\220\347\264\204\345\211\215\350\251\242\345\225\217.txt" "b/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\351\240\220\347\264\204\345\211\215\350\251\242\345\225\217.txt"
index 207a414..77a306f 100644
--- "a/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\351\240\220\347\264\204\345\211\215\350\251\242\345\225\217.txt"
+++ "b/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\351\240\220\347\264\204\345\211\215\350\251\242\345\225\217.txt"
@@ -13,7 +13,7 @@
"email":"pollex@pollex.comm.tw",
"contactType":"phone",
"gender":"male",
- "age":20,
+ "age":"20-25",
"job":"撠����",
"requirement":"鞎∪����,鞈蝘餉��",
"hopeContactTime":"'����~�����, 12:00~14:00, 18:00~21:00'",
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" "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"
index cf54e8d..4047029 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"
+++ "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"
@@ -5,7 +5,6 @@
response body :
-
[
{
"id": 13,
@@ -13,7 +12,7 @@
"email": "pollex@pollex.comm.tw",
"contactType": "phone",
"gender": "male",
- "age": 20,
+ "age": null,
"job": "撠����",
"requirement": "鞎∪����,鞈蝘餉��",
"communicateStatus": "reserved",
@@ -30,7 +29,7 @@
"email": "pollex@pollex.comm.tw",
"contactType": "phone",
"gender": "male",
- "age": 20,
+ "age": null,
"job": "撠����",
"requirement": "鞎∪����,鞈蝘餉��",
"communicateStatus": "reserved",
@@ -40,5 +39,39 @@
"agentNo": "admin",
"customerId": 2,
"name": "Jack"
+ },
+ {
+ "id": 15,
+ "phone": "09123456789",
+ "email": "pollex@pollex.comm.tw",
+ "contactType": "phone",
+ "gender": "male",
+ "age": null,
+ "job": "撠����",
+ "requirement": "鞎∪����,鞈蝘餉��",
+ "communicateStatus": "reserved",
+ "hopeContactTime": "'����~�����, 12:00~14:00, 18:00~21:00'",
+ "otherRequirement": "憭馳����",
+ "appointmentDate": "2021-11-10T09:42:28.134Z",
+ "agentNo": "admin",
+ "customerId": 2,
+ "name": "Jack"
+ },
+ {
+ "id": 16,
+ "phone": "09123456789",
+ "email": "pollex@pollex.comm.tw",
+ "contactType": "phone",
+ "gender": "male",
+ "age": "20-25",
+ "job": "撠����",
+ "requirement": "鞎∪����,鞈蝘餉��",
+ "communicateStatus": "reserved",
+ "hopeContactTime": "'����~�����, 12:00~14:00, 18:00~21:00'",
+ "otherRequirement": "憭馳����",
+ "appointmentDate": "2021-11-10T09:44:43.445Z",
+ "agentNo": "admin",
+ "customerId": 2,
+ "name": "Jack"
}
]
\ No newline at end of file
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 c614e81..803a890 100644
--- a/pamapi/src/main/java/com/pollex/pam/domain/Appointment.java
+++ b/pamapi/src/main/java/com/pollex/pam/domain/Appointment.java
@@ -40,7 +40,7 @@
private String gender;
@Column(name = "age")
- private int age;
+ private String age;
@Column(name = "job")
private String job;
@@ -107,11 +107,11 @@
this.gender = gender;
}
- public int getAge() {
+ public String getAge() {
return age;
}
- public void setAge(int age) {
+ public void setAge(String age) {
this.age = age;
}
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 05268c7..66d52ba 100644
--- a/pamapi/src/main/java/com/pollex/pam/domain/AppointmentCustomerView.java
+++ b/pamapi/src/main/java/com/pollex/pam/domain/AppointmentCustomerView.java
@@ -38,7 +38,7 @@
private String gender;
@Column(name = "age")
- private int age;
+ private String age;
@Column(name = "job")
private String job;
@@ -108,11 +108,11 @@
this.gender = gender;
}
- public int getAge() {
+ public String getAge() {
return age;
}
- public void setAge(int age) {
+ public void setAge(String age) {
this.age = age;
}
diff --git a/pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentCreateDTO.java b/pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentCreateDTO.java
index 9c03b5d..3c566ab 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentCreateDTO.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentCreateDTO.java
@@ -6,7 +6,7 @@
private String email;
private String contactType; //�蝯⊥撘�
private String gender;
- private int age;
+ private String age;
private String job;
private String requirement;
private String hopeContactTime; //撣�蝯∠����
@@ -61,10 +61,10 @@
public void setOtherRequirement(String otherRequirement) {
this.otherRequirement = otherRequirement;
}
- public int getAge() {
+ public String getAge() {
return age;
}
- public void setAge(int age) {
+ public void setAge(String age) {
this.age = age;
}
public String getAgentNo() {
diff --git a/pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentCustomerViewDTO.java b/pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentCustomerViewDTO.java
index 3add092..2a94713 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentCustomerViewDTO.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentCustomerViewDTO.java
@@ -15,7 +15,7 @@
private String email;
private String contactType;
private String gender;
- private int age;
+ private String age;
private String job;
private String requirement;
private ContactStatusEnum communicateStatus;
@@ -55,10 +55,10 @@
public void setGender(String gender) {
this.gender = gender;
}
- public int getAge() {
+ public String getAge() {
return age;
}
- public void setAge(int age) {
+ public void setAge(String age) {
this.age = age;
}
public String getJob() {
diff --git a/pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentDTO.java b/pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentDTO.java
index 05aa7cf..55cd46a 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentDTO.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/dto/AppointmentDTO.java
@@ -14,7 +14,7 @@
private String email;
private String contactType;
private String gender;
- private int age;
+ private String age;
private String job;
private String requirement;
private ContactStatusEnum communicateStatus;
@@ -54,10 +54,10 @@
public void setGender(String gender) {
this.gender = gender;
}
- public int getAge() {
+ public String getAge() {
return age;
}
- public void setAge(int age) {
+ public void setAge(String age) {
this.age = age;
}
public String getJob() {
--
Gitblit v1.8.0