From 551d18a095e8fe462e4099fdd5b2578e12934d45 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 08 二月 2022 12:25:44 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into Phase3

---
 pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDTO.java |  107 ++++++++++++++++++++++-------------------------------
 1 files changed, 45 insertions(+), 62 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 dbe0181..6494754 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,33 +1,28 @@
 package com.pollex.pam.service.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.pollex.pam.enums.ContactStatusEnum;
+import com.pollex.pam.enums.GenderEnum;
 
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
 import java.util.List;
 
 public class ConsultantDTO {
 
-    @JsonProperty("new")
-    private boolean newConsultant;
-    private String agentNo;
     private String name;
-    private String img;
-    private List<String> expertise;
-    private Float avgScore;
-    private ContactStatusEnum contactStatus;
-    private Instant updateTime;
+    private String agentNo;
     private String role;
-    private String seniority;
-    private Long latestAppointmentId;
+    private Float avgScore;
+    private List<String> serveArea;
+    private Long seniority_year;
+    private Long seniority_month;
+    private List<String> expertise;
+    private GenderEnum gender;
+    private String communicationStyle;
 
-    public boolean isNewConsultant() {
-        if(updateTime != null){
-            Instant nowTimestamp = Instant.now();
-            return ChronoUnit.DAYS.between(updateTime, nowTimestamp) < 3;
-        }
-        return false;
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
     }
 
     public String getAgentNo() {
@@ -38,28 +33,12 @@
         this.agentNo = agentNo;
     }
 
-    public String getName() {
-        return name;
+    public String getRole() {
+        return role;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getImg() {
-        return img;
-    }
-
-    public void setImg(String img) {
-        this.img = img;
-    }
-
-    public List<String> getExpertise() {
-        return expertise;
-    }
-
-    public void setExpertise(List<String> expertise) {
-        this.expertise = expertise;
+    public void setRole(String role) {
+        this.role = role;
     }
 
     public Float getAvgScore() {
@@ -70,47 +49,51 @@
         this.avgScore = avgScore;
     }
 
-    public ContactStatusEnum getContactStatus() {
-        return contactStatus;
+    public List<String> getServeArea() {
+        return serveArea;
     }
 
-    public void setContactStatus(ContactStatusEnum contactStatus) {
-        this.contactStatus = contactStatus;
+    public void setServeArea(List<String> serveArea) {
+        this.serveArea = serveArea;
     }
 
-    public Instant getUpdateTime() {
-        return updateTime;
+    public Long getSeniority_year() {
+        return seniority_year;
     }
 
-    public void setUpdateTime(Instant updateTime) {
-        this.updateTime = updateTime;
+    public void setSeniority_year(Long seniority_year) {
+        this.seniority_year = seniority_year;
     }
 
-    public String getRole() {
-        return role;
+    public Long getSeniority_month() {
+        return seniority_month;
     }
 
-    public void setRole(String role) {
-        this.role = role;
+    public void setSeniority_month(Long seniority_month) {
+        this.seniority_month = seniority_month;
     }
 
-    public String getSeniority() {
-        return seniority;
+    public List<String> getExpertise() {
+        return expertise;
     }
 
-    public void setSeniority(String seniority) {
-        this.seniority = seniority;
+    public void setExpertise(List<String> expertise) {
+        this.expertise = expertise;
     }
 
-    public void setNewConsultant(boolean newConsultant) {
-        this.newConsultant = newConsultant;
+    public GenderEnum getGender() {
+        return gender;
     }
 
-    public Long getLatestAppointmentId() {
-        return latestAppointmentId;
+    public void setGender(GenderEnum gender) {
+        this.gender = gender;
     }
 
-    public void setLatestAppointmentId(Long latestAppointmentId) {
-        this.latestAppointmentId = latestAppointmentId;
+    public String getCommunicationStyle() {
+        return communicationStyle;
+    }
+
+    public void setCommunicationStyle(String communicationStyle) {
+        this.communicationStyle = communicationStyle;
     }
 }

--
Gitblit v1.8.0