From fa782dca2a00e9a4a48c5b3588f5eb3b47af93cf Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 01 三月 2022 15:41:05 +0800
Subject: [PATCH] [update] [todo 136031] 諮詢度表現，提供前端該顧問所有預約單數量以及近一個月的預約單數量

---
 pamapi/src/main/java/com/pollex/pam/domain/Consultant.java |   89 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/pamapi/src/main/java/com/pollex/pam/domain/Consultant.java b/pamapi/src/main/java/com/pollex/pam/domain/Consultant.java
index a576a9d..f3552b3 100644
--- a/pamapi/src/main/java/com/pollex/pam/domain/Consultant.java
+++ b/pamapi/src/main/java/com/pollex/pam/domain/Consultant.java
@@ -1,5 +1,6 @@
 package com.pollex.pam.domain;
 
+import com.pollex.pam.enums.ConsultantStatusEnum;
 import com.pollex.pam.enums.GenderEnum;
 
 import javax.persistence.*;
@@ -17,7 +18,7 @@
     @SequenceGenerator(name = "sequenceGenerator")
     private Long id;
 
-    @Column(name = "agent_no")
+    @Column(name = "agent_no", unique = true)
     private String agentNo;
 
     @Column(name = "name")
@@ -51,11 +52,11 @@
     @Column(name = "company_address")
     private String companyAddress;
 
-    @Column(name = "latest_login_time")
-    private Instant latestLoginTime;
+    @Column(name = "seniority_year")
+    private Long seniorityYear;
 
-    @Column(name = "seniority")
-    private String seniority;
+    @Column(name = "seniority_month")
+    private Long seniorityMonth;
 
     @Column(name = "concept")
     private String concept;
@@ -68,6 +69,19 @@
 
     @Column(name = "recommend")
     private Boolean recommend;
+
+    @Column(name = "communication_style")
+    private String communicationStyle;
+
+    @Column(name = "email")
+    private String email;
+
+    @Enumerated(value = EnumType.STRING)
+    @Column(name = "status")
+    private ConsultantStatusEnum status;
+
+    @Column(name = "latest_login_time")
+    private Instant latestLoginTime;
 
     public Long getId() {
         return id;
@@ -162,23 +176,30 @@
     }
 
     public void setCompanyAddress(String companyAddress) {
-        companyAddress = companyAddress;
+        this.companyAddress = companyAddress;
     }
 
-    public Instant getLatestLoginTime() {
-        return latestLoginTime;
+    public Long getSeniorityYear() {
+        return seniorityYear;
     }
 
-    public void setLatestLoginTime(Instant lastLoginTime) {
-        this.latestLoginTime = lastLoginTime;
+    public void setSeniorityYear(Long seniorityYear) {
+        this.seniorityYear = seniorityYear;
     }
 
-    public String getSeniority() {
-        return seniority;
+    public Long getSeniorityMonth() {
+        return seniorityMonth;
     }
 
-    public void setSeniority(String seniority) {
-        this.seniority = seniority;
+    public void setSeniorityMonth(Long seniorityMonth) {
+        this.seniorityMonth = seniorityMonth;
+    }
+
+    public String getSeniorityDTOString() {
+        final String seniorityYearString = this.seniorityYear != 0 ? this.seniorityYear + " 撟� " : "";
+        final String seniorityMonthString = this.seniorityMonth != 0 ? this.seniorityMonth + " ���" : "";
+
+        return seniorityYearString + seniorityMonthString;
     }
 
     public String getConcept() {
@@ -213,6 +234,38 @@
         this.recommend = recommend;
     }
 
+    public String getCommunicationStyle() {
+        return communicationStyle;
+    }
+
+    public void setCommunicationStyle(String communicationStyle) {
+        this.communicationStyle = communicationStyle;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public ConsultantStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(ConsultantStatusEnum status) {
+        this.status = status;
+    }
+
+    public Instant getLatestLoginTime() {
+        return latestLoginTime;
+    }
+
+    public void setLatestLoginTime(Instant latestLoginTime) {
+        this.latestLoginTime = latestLoginTime;
+    }
+
     @Override
     public String toString() {
         return "Consultant{" +
@@ -225,15 +278,17 @@
             ", title='" + title + '\'' +
             ", role='" + role + '\'' +
             ", serveArea='" + serveArea + '\'' +
-            ", gender='" + gender + '\'' +
+            ", gender=" + gender +
             ", phoneNumber='" + phoneNumber + '\'' +
             ", companyAddress='" + companyAddress + '\'' +
-            ", latestLoginTime=" + latestLoginTime +
-            ", seniority='" + seniority + '\'' +
+            ", seniorityYear=" + seniorityYear +
+            ", seniorityMonth=" + seniorityMonth +
             ", concept='" + concept + '\'' +
             ", experience='" + experience + '\'' +
             ", award='" + award + '\'' +
             ", recommend=" + recommend +
+            ", communicationStyle='" + communicationStyle + '\'' +
+            ", email='" + email + '\'' +
             '}';
     }
 }

--
Gitblit v1.8.0