From ae4db5435180c44b37f521c463b17f2023ac1d8c Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 18 二月 2022 09:25:50 +0800
Subject: [PATCH] [update] 若顧問停用時，將無法登入 (文案待確認)

---
 pamapi/src/main/java/com/pollex/pam/domain/Consultant.java |   64 ++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 16 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 6fd2b42..401c42d 100644
--- a/pamapi/src/main/java/com/pollex/pam/domain/Consultant.java
+++ b/pamapi/src/main/java/com/pollex/pam/domain/Consultant.java
@@ -1,10 +1,10 @@
 package com.pollex.pam.domain;
 
+import com.pollex.pam.enums.ConsultantStatusEnum;
 import com.pollex.pam.enums.GenderEnum;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.time.Instant;
 
 @Entity
 @Table(name = "consultant")
@@ -51,11 +51,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;
@@ -71,6 +71,14 @@
 
     @Column(name = "communication_style")
     private String communicationStyle;
+
+    @Column(name = "email")
+    private String email;
+
+    @Enumerated(value = EnumType.STRING)
+    @Column(name = "status")
+    private ConsultantStatusEnum status;
+
 
     public Long getId() {
         return id;
@@ -165,23 +173,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() {
@@ -224,6 +239,22 @@
         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;
+    }
+
     @Override
     public String toString() {
         return "Consultant{" +
@@ -239,13 +270,14 @@
             ", 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