From 41bc5df9cda6a43ef47313622dd1ffde1480d06f Mon Sep 17 00:00:00 2001 From: KillerADO <wayne8692wayne8692@gmail.com> Date: 星期四, 23 十二月 2021 10:49:04 +0800 Subject: [PATCH] [update] 調整簡訊的service url與新增簡訊的標題欄位 --- pamapi/src/main/java/com/pollex/pam/domain/Consultant.java | 48 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 33 insertions(+), 15 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..5071ff6 100644 --- a/pamapi/src/main/java/com/pollex/pam/domain/Consultant.java +++ b/pamapi/src/main/java/com/pollex/pam/domain/Consultant.java @@ -4,7 +4,6 @@ import javax.persistence.*; import java.io.Serializable; -import java.time.Instant; @Entity @Table(name = "consultant") @@ -51,11 +50,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 +70,9 @@ @Column(name = "communication_style") private String communicationStyle; + + @Column(name = "email") + private String email; public Long getId() { return id; @@ -168,20 +170,27 @@ 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 +233,14 @@ this.communicationStyle = communicationStyle; } + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + @Override public String toString() { return "Consultant{" + @@ -239,13 +256,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