From bb764a635e79bbfc094aa1971202aba90180dd0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Mon, 3 Jul 2023 15:20:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=B8=BB=E7=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/HyPartnerLineInfoMapper.xml        |  1 +
 .../PartnerLineInfoAndBaseInfoDTO.java        |  2 ++
 .../vo/PartnerLineInfoAndBaseInfoVO.java      |  7 +++++
 .../impl/HyPartnerLineInfoServiceImpl.java    | 27 ++++++++++++-------
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index 996e2cb08..a6a294b13 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -294,6 +294,7 @@
   <select id="selectPartnerLineInfoAndBaseInfo" resultType="com.cool.store.dto.partner.PartnerLineInfoAndBaseInfoDTO">
     select
       a.id as id,
+      a.development_director as developmentDirector,
       a.partner_id as partnerId,
       a.workflow_stage  as workflowStage,
       a.line_status as lineStatus,
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java
index bb9c5bd3b..c2c53eef2 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java
@@ -82,4 +82,6 @@ public class PartnerLineInfoAndBaseInfoDTO {
     private String idCard;
 
     private String education;
+
+    private String developmentDirector;
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java
index bd116cbf7..35d11c8cf 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java
@@ -87,7 +87,14 @@ public class PartnerLineInfoAndBaseInfoVO {
     @ApiModelProperty("线索来源名称")
     private String channelName;
 
+    @ApiModelProperty("教育")
     private String education;
 
+    @ApiModelProperty("idCard")
     private String idCard;
+
+    @ApiModelProperty("开发主管")
+    private String developmentDirector;
+    @ApiModelProperty("开发主管")
+    private String developmentDirectorName;
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
index b332b2ea9..f99279202 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
@@ -98,20 +98,28 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
             throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
         }
         PartnerLineInfoAndBaseInfoVO partnerLineInfoAndBaseInfoVO = convertPartnerLineInfoAndBaseInfoDTOToVo(partnerLineInfoAndBaseInfoDTO);
-        EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoDTO.getPassUserId());
-        if (userInfo!=null){
-            partnerLineInfoAndBaseInfoVO.setPassUserName(userInfo.getName());
-            partnerLineInfoAndBaseInfoVO.setPassUserMobile(userInfo.getMobile());
+        List<String> userIds = new ArrayList<>();
+        if (StringUtils.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getPassUserId())){
+            userIds.add(partnerLineInfoAndBaseInfoDTO.getPassUserId());
         }
+        if (StringUtils.isNotEmpty(partnerLineInfoAndBaseInfoVO.getInvestmentManager())){
+            userIds.add(partnerLineInfoAndBaseInfoVO.getInvestmentManager());
+        }
+        if (StringUtils.isNotEmpty(partnerLineInfoAndBaseInfoVO.getDevelopmentDirector())){
+            userIds.add(partnerLineInfoAndBaseInfoVO.getDevelopmentDirector());
+        }
+
+        List<EnterpriseUserDO> userList = enterpriseUserDAO.getUserInfoByUserIds(userIds);
+        Map<String, EnterpriseUserDO> userDOMap = userList.stream().collect(Collectors.toMap(EnterpriseUserDO::getUserId, data -> data));
+        partnerLineInfoAndBaseInfoVO.setPassUserName(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getPassUserId(),new EnterpriseUserDO()).getName());
+        partnerLineInfoAndBaseInfoVO.setPassUserMobile(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getPassUserId(),new EnterpriseUserDO()).getMobile());
+        partnerLineInfoAndBaseInfoVO.setInvestmentManagerName(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getInvestmentManager(),new EnterpriseUserDO()).getName());
+        partnerLineInfoAndBaseInfoVO.setInvestmentManagerPhone(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getInvestmentManager(),new EnterpriseUserDO()).getMobile());
+        partnerLineInfoAndBaseInfoVO.setDevelopmentDirectorName(userDOMap.getOrDefault(partnerLineInfoAndBaseInfoVO.getDevelopmentDirector(),new EnterpriseUserDO()).getName());
         if (StringUtils.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getWantShopArea())){
         HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(partnerLineInfoAndBaseInfoDTO.getWantShopArea()));
             partnerLineInfoAndBaseInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/"," "));
         }
-        EnterpriseUserDO investmentManager = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoVO.getInvestmentManager());
-        if (investmentManager!=null){
-            partnerLineInfoAndBaseInfoVO.setInvestmentManagerName(investmentManager.getName());
-            partnerLineInfoAndBaseInfoVO.setInvestmentManagerPhone(investmentManager.getMobile());
-        }
         return partnerLineInfoAndBaseInfoVO;
     }
 
@@ -756,6 +764,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
         partnerLineInfoAndBaseInfoVO.setLiveArea(partnerLineInfoAndBaseInfoDTO.getLiveArea());
         partnerLineInfoAndBaseInfoVO.setIdCard(partnerLineInfoAndBaseInfoDTO.getIdCard());
         partnerLineInfoAndBaseInfoVO.setChannelName(partnerLineInfoAndBaseInfoDTO.getChannelName());
+        partnerLineInfoAndBaseInfoVO.setDevelopmentDirector(partnerLineInfoAndBaseInfoDTO.getDevelopmentDirector());
         if (StringUtil.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getCertifyFile())){
             partnerLineInfoAndBaseInfoVO.setPassCertifyFile(JSONObject.parseArray(partnerLineInfoAndBaseInfoDTO.getCertifyFile(), String.class));
         }