From 34b08e1c461f5e08675fcff95525956d7c4bef11 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:38:48 +0800
Subject: [PATCH] Merge branch 'Phase3' into pollex-dev
---
pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDTO.java | 127 ++++++++++++++++++++++++------------------
1 files changed, 72 insertions(+), 55 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDTO.java b/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDTO.java
index 6494754..f847769 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDTO.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDTO.java
@@ -1,28 +1,33 @@
package com.pollex.pam.service.dto;
-import com.pollex.pam.enums.GenderEnum;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.pollex.pam.enums.ContactStatusEnum;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
import java.util.List;
public class ConsultantDTO {
- private String name;
+ @JsonProperty("new")
+ private boolean newConsultant;
private String agentNo;
- private String role;
- private Float avgScore;
- private List<String> serveArea;
- private Long seniority_year;
- private Long seniority_month;
+ private String name;
+ private String img;
private List<String> expertise;
- private GenderEnum gender;
- private String communicationStyle;
+ private Float avgScore;
+ private ContactStatusEnum contactStatus;
+ private Instant updateTime;
+ private String role;
+ private String seniority;
+ private int suitability;
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
+ public boolean isNewConsultant() {
+ if(updateTime != null){
+ Instant nowTimestamp = Instant.now();
+ return ChronoUnit.DAYS.between(updateTime, nowTimestamp) < 3;
+ }
+ return false;
}
public String getAgentNo() {
@@ -33,44 +38,20 @@
this.agentNo = agentNo;
}
- public String getRole() {
- return role;
+ public String getName() {
+ return name;
}
- public void setRole(String role) {
- this.role = role;
+ public void setName(String name) {
+ this.name = name;
}
- public Float getAvgScore() {
- return avgScore;
+ public String getImg() {
+ return img;
}
- public void setAvgScore(Float avgScore) {
- this.avgScore = avgScore;
- }
-
- public List<String> getServeArea() {
- return serveArea;
- }
-
- public void setServeArea(List<String> serveArea) {
- this.serveArea = serveArea;
- }
-
- public Long getSeniority_year() {
- return seniority_year;
- }
-
- public void setSeniority_year(Long seniority_year) {
- this.seniority_year = seniority_year;
- }
-
- public Long getSeniority_month() {
- return seniority_month;
- }
-
- public void setSeniority_month(Long seniority_month) {
- this.seniority_month = seniority_month;
+ public void setImg(String img) {
+ this.img = img;
}
public List<String> getExpertise() {
@@ -81,19 +62,55 @@
this.expertise = expertise;
}
- public GenderEnum getGender() {
- return gender;
+ public Float getAvgScore() {
+ return avgScore;
}
- public void setGender(GenderEnum gender) {
- this.gender = gender;
+ public void setAvgScore(Float avgScore) {
+ this.avgScore = avgScore;
}
- public String getCommunicationStyle() {
- return communicationStyle;
+ public ContactStatusEnum getContactStatus() {
+ return contactStatus;
}
- public void setCommunicationStyle(String communicationStyle) {
- this.communicationStyle = communicationStyle;
+ public void setContactStatus(ContactStatusEnum contactStatus) {
+ this.contactStatus = contactStatus;
+ }
+
+ public Instant getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Instant updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getRole() {
+ return role;
+ }
+
+ public void setRole(String role) {
+ this.role = role;
+ }
+
+ public String getSeniority() {
+ return seniority;
+ }
+
+ public void setSeniority(String seniority) {
+ this.seniority = seniority;
+ }
+
+ public void setNewConsultant(boolean newConsultant) {
+ this.newConsultant = newConsultant;
+ }
+
+ public int getSuitability() {
+ return suitability;
+ }
+
+ public void setSuitability(int suitability) {
+ this.suitability = suitability;
}
}
--
Gitblit v1.8.0