From a3716f72066d25d745f4d5103ff23a553c3e102b Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期四, 17 二月 2022 11:41:19 +0800 Subject: [PATCH] Merge branch 'sit' into uat --- pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDetailDTO.java | 71 ++++++++++++++++++++++------------- 1 files changed, 45 insertions(+), 26 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDetailDTO.java b/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDetailDTO.java index 46cc4e6..ea92f3f 100644 --- a/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDetailDTO.java +++ b/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDetailDTO.java @@ -1,18 +1,16 @@ package com.pollex.pam.service.dto; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.time.Instant; import java.util.List; + +import com.pollex.pam.enums.GenderEnum; public class ConsultantDetailDTO { private String name; private String agentNo; private String role; - private String image; + private String img; private Float avgScore; private String title; private String phoneNumber; @@ -20,12 +18,14 @@ private String companyAddress; private Instant latestLoginTime; private String seniority; - private Number suitability; private Number evaluation; - private List<String> expertises; + private List<String> expertise; private String concept; - private List<String> experiences; + private String experiences; private String awards; + private GenderEnum gender; + private String communicationStyle; + private String email; public String getName() { return name; @@ -51,12 +51,12 @@ this.role = role; } - public String getImage() { - return image; + public String getImg() { + return img; } - public void setImage(String image) { - this.image = image; + public void setImg(String img) { + this.img = img; } public Float getAvgScore() { @@ -115,14 +115,6 @@ this.seniority = seniority; } - public Number getSuitability() { - return suitability; - } - - public void setSuitability(Number suitability) { - this.suitability = suitability; - } - public Number getEvaluation() { return evaluation; } @@ -131,12 +123,12 @@ this.evaluation = evaluation; } - public List<String> getExpertises() { - return expertises; + public List<String> getExpertise() { + return expertise; } - public void setExpertises(List<String> expertises) { - this.expertises = expertises; + public void setExpertise(List<String> expertise) { + this.expertise = expertise; } public String getConcept() { @@ -147,11 +139,11 @@ this.concept = concept; } - public List<String> getExperiences() { + public String getExperiences() { return experiences; } - public void setExperiences(List<String> experiences) { + public void setExperiences(String experiences) { this.experiences = experiences; } @@ -162,4 +154,31 @@ public void setAwards(String awards) { this.awards = awards; } + + public GenderEnum getGender() { + return gender; + } + + public void setGender(GenderEnum gender) { + this.gender = gender; + } + + 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; + } + + + } -- Gitblit v1.8.0