From 2c6a6b6f5888a727a81be34edc4cc5078fcd2cf3 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期一, 27 十二月 2021 10:16:23 +0800
Subject: [PATCH] [UPDATE] 調整修改顧問API的欄位 [UPDATE] 調整取得顧問詳細資料的API欄位新增 溝通風格和性別欄位
---
pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantDetailDTO.java | 21 ++++++++++
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 2 +
pamapi/src/doc/顧問API/編輯修改顧問資料.txt | 2
pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantEditDTO.java | 28 +++++++------
pamapi/src/main/java/com/pollex/pam/service/util/StringUtils.java | 18 +++++++++
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantDTOMapper.java | 4 +
pamapi/src/doc/顧問API/指定顧問詳細資訊.txt | 41 ++++++++++----------
7 files changed, 80 insertions(+), 36 deletions(-)
diff --git "a/pamapi/src/doc/\351\241\247\345\225\217API/\346\214\207\345\256\232\351\241\247\345\225\217\350\251\263\347\264\260\350\263\207\350\250\212.txt" "b/pamapi/src/doc/\351\241\247\345\225\217API/\346\214\207\345\256\232\351\241\247\345\225\217\350\251\263\347\264\260\350\263\207\350\250\212.txt"
index 008b9c8..e99e2ba 100644
--- "a/pamapi/src/doc/\351\241\247\345\225\217API/\346\214\207\345\256\232\351\241\247\345\225\217\350\251\263\347\264\260\350\263\207\350\250\212.txt"
+++ "b/pamapi/src/doc/\351\241\247\345\225\217API/\346\214\207\345\256\232\351\241\247\345\225\217\350\251\263\347\264\260\350\263\207\350\250\212.txt"
@@ -2,24 +2,23 @@
response body:
{
- "name": "皜祈岫��璆剖�",
- "agentNo": "12345",
- "role": "靽蝬�鈭�",
- "img": "",
- "avgScore": 4.7,
- "title": "撠����",
- "phoneNumber": "0912345678",
- "serveArea": "������",
- "companyAddress": "����縑蝢拙�敹�頝臭�畾�1���",
- "latestLoginTime": "2021-11-29T07:39:22.135Z", // ����敺�蝝�����葆null
- "seniority": "4撟�2���",
- "suitability": 0,
- "evaluation": 0,
- "expertise": [
- "鞎∪����",
- "鞈頧宏"
- ],
- "concept": "憯賡頝臭���敺���策摰Ｘ靽∩遙����������憟賜�瘜��平隞乩�����蝘���鈭箇敹急����縑敹萄����旦�靽∴���末��平��犖�嚗������憿敹鈭箇����瘞貊���ˊ�鈭平��������",
- "experiences": "�憭扯瓷��頂,蝢��移蝞葦��"
- "awards": "��嚗�2020撟港摩璅�之��雿單平�� ����嚗犖頨思�璆剖�霅��馳�隞�霅�犖頨思�隞���犖霅�瓷�靽隞���犖霅"
-}
+ "name" : "撏祠",
+ "agentNo" : "R221444250",
+ "role" : "����蝬�鈭�",
+ "img" : "avatar10.jpg",
+ "avgScore" : 3.1,
+ "title" : "�����(DM)",
+ "phoneNumber" : "0987168787",
+ "serveArea" : "��",
+ "companyAddress" : "��蝮����銝剜迤頝�30���9璅�",
+ "latestLoginTime" : "2021-12-24T08:48:21.497Z",
+ "seniority" : "38 撟� ",
+ "suitability" : 50,
+ "evaluation" : 50,
+ "expertise" : [ "�摨瑁����", "摮戊��", "鞈閬��", "璅暑��隡�", "靽�瑼�/閬��", "����" ],
+ "concept" : "瘥遢靽閬������\r\n�敹�敹�票敹����恥�\r\n\r\n����之靽∪艙\r\n��� 擃p�� ���祥�����r\n��� 蝪∪��� ��������r\n��� 摰Ｚˊ��� �銝�隞賡������r\n\r\n���������風�������犖",
+ "experiences" : "暻餌��極摮賊������飛蝟�,�憭余MBA,銝剖�之摮貉瓷��頂,鈭箄澈靽霅,鞎∠靽霅,�����霅,憭馳�隞�霅,��隡��移蝞葦霅,��靽鴽方�犖��岫霅,蝢�ˊ�蝞∴坐撣怨�,蝢�ˊ�鴽方�葦霅,蝢�瓷������靽葦霅",
+ "awards" : "20甈∪��匱蝥���(IQA)\r\n30甈∠�������(MDRT)��\r\n��瓷閬�“�����(CFP)",
+ "gender" : "female",
+ "communicationStyle" : "雓寞��祕��翰銝餃������隢◢頞�"
+}
\ No newline at end of file
diff --git "a/pamapi/src/doc/\351\241\247\345\225\217API/\347\267\250\350\274\257\344\277\256\346\224\271\351\241\247\345\225\217\350\263\207\346\226\231.txt" "b/pamapi/src/doc/\351\241\247\345\225\217API/\347\267\250\350\274\257\344\277\256\346\224\271\351\241\247\345\225\217\350\263\207\346\226\231.txt"
index 3ab3d96..e66f478 100644
--- "a/pamapi/src/doc/\351\241\247\345\225\217API/\347\267\250\350\274\257\344\277\256\346\224\271\351\241\247\345\225\217\350\263\207\346\226\231.txt"
+++ "b/pamapi/src/doc/\351\241\247\345\225\217API/\347\267\250\350\274\257\344\277\256\346\224\271\351\241\247\345\225\217\350\263\207\346\226\231.txt"
@@ -10,7 +10,7 @@
{
"agentNo":"A568420",
"name":"雓�◢",
- "expertise":"�摨瑁����,摮戊��,鞈閬��,璅暑��隡�,靽�瑼�/閬��,����,����瓷",
+ "expertise":["�摨瑁����","摮戊��"],
"title":"璆剖�� (SC)",
"role":"����蝬�鈭�",
"serveArea":"������蝮�",
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 30c51a1..9f43ef6 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
@@ -3,6 +3,8 @@
import java.time.Instant;
import java.util.List;
+import com.pollex.pam.enums.GenderEnum;
+
public class ConsultantDetailDTO {
private String name;
@@ -22,6 +24,8 @@
private String concept;
private String experiences;
private String awards;
+ private GenderEnum gender;
+ private String communicationStyle;
public String getName() {
return name;
@@ -158,4 +162,21 @@
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;
+ }
+
}
diff --git a/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantEditDTO.java b/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantEditDTO.java
index 8b18942..0489a1d 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantEditDTO.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/dto/ConsultantEditDTO.java
@@ -1,12 +1,14 @@
package com.pollex.pam.service.dto;
+import java.util.List;
+
import com.pollex.pam.enums.GenderEnum;
public class ConsultantEditDTO {
// private Long id;
private String name;
- private String expertise;
+ private List<String> expertise;
private String title;
private String role;
private String serveArea;
@@ -16,8 +18,8 @@
private Long seniorityYear;
private Long seniorityMonth;
private String concept;
- private String experience;
- private String award;
+ private String experiences;
+ private String awards;
private String communicationStyle;
private String photoBase64;
private String photoFileName;
@@ -35,10 +37,10 @@
public void setName(String name) {
this.name = name;
}
- public String getExpertise() {
+ public List<String> getExpertise() {
return expertise;
}
- public void setExpertise(String expertise) {
+ public void setExpertise(List<String> expertise) {
this.expertise = expertise;
}
public String getTitle() {
@@ -95,17 +97,17 @@
public void setConcept(String concept) {
this.concept = concept;
}
- public String getExperience() {
- return experience;
+ public String getExperiences() {
+ return experiences;
}
- public void setExperience(String experience) {
- this.experience = experience;
+ public void setExperiences(String experiences) {
+ this.experiences = experiences;
}
- public String getAward() {
- return award;
+ public String getAwards() {
+ return awards;
}
- public void setAward(String award) {
- this.award = award;
+ public void setAwards(String awards) {
+ this.awards = awards;
}
public String getCommunicationStyle() {
return communicationStyle;
diff --git a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantDTOMapper.java b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantDTOMapper.java
index 1437a96..3ec323b 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantDTOMapper.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantDTOMapper.java
@@ -8,6 +8,7 @@
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.service.dto.ConsultantEditDTO;
import com.pollex.pam.service.util.FileUtil;
+import com.pollex.pam.service.util.StringUtils;
@Service
public class ConsultantDTOMapper {
@@ -18,7 +19,8 @@
public void copyToConsultant(ConsultantEditDTO source, Consultant target) {
BeanUtils.copyProperties(source, target);
target.setPhotoPath(FileUtil.toPath(source.getPhotoFileName(), applicationProperty.getFileFolderPath()));
-
+ String expertise = StringUtils.convertToString(source.getExpertise(), ",");
+ target.setExpertise(expertise);
}
diff --git a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
index e92150e..275d246 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
@@ -5,6 +5,7 @@
import com.pollex.pam.service.dto.ConsultantDetailDTO;
import com.pollex.pam.service.dto.CustomerFavoriteConsultantDTO;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -50,6 +51,7 @@
public ConsultantDetailDTO toDetailDto(Consultant source) {
ConsultantDetailDTO consultantDetailDTO = new ConsultantDetailDTO();
+ BeanUtils.copyProperties(source, consultantDetailDTO);
consultantDetailDTO.setName(source.getName());
consultantDetailDTO.setAgentNo(source.getAgentNo());
consultantDetailDTO.setRole(source.getRole());
diff --git a/pamapi/src/main/java/com/pollex/pam/service/util/StringUtils.java b/pamapi/src/main/java/com/pollex/pam/service/util/StringUtils.java
new file mode 100644
index 0000000..fd2350a
--- /dev/null
+++ b/pamapi/src/main/java/com/pollex/pam/service/util/StringUtils.java
@@ -0,0 +1,18 @@
+package com.pollex.pam.service.util;
+
+import java.util.List;
+
+public class StringUtils {
+
+ public static String convertToString(List<String> source
+ , String separator) {
+ StringBuilder result = new StringBuilder();
+ for (String sourceString : source) {
+ result.append(sourceString+separator);
+ }
+ result.deleteCharAt(result.length()-1);
+ return result.toString();
+ }
+
+
+}
--
Gitblit v1.8.0