From abef0b95d3299a400b2c8bd096fc42847cb3e792 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 24 Feb 2021 19:51:44 +0800
Subject: [PATCH] =?UTF-8?q?data-stat=E7=BB=9F=E8=AE=A1=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9:=E6=8C=87=E6=A0=87=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AD=90=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dao/crm/CustomerRelationDao.java    |  6 ++----
 .../crm/impl/CustomerRelationServiceImpl.java | 19 +++++++++++++++++--
 .../mapper/crm/CustomerRelationDao.xml        | 16 +++-------------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/crm/CustomerRelationDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/crm/CustomerRelationDao.java
index d79e843076..87a8db63bf 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/crm/CustomerRelationDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/crm/CustomerRelationDao.java
@@ -23,8 +23,6 @@ import com.epmet.entity.crm.CustomerRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * 客户关系表(01.14 add)
  *
@@ -35,10 +33,10 @@ import java.util.List;
 public interface CustomerRelationDao extends BaseDao<CustomerRelationEntity> {
 
     /**
-     * @param customerIds
+     * @param customerId
      * @author yinzuomei
      * @description 查询当前客户的area_code信息、以及下一级客户列表
      * @Date 2021/1/21 11:27
      **/
-    List<CustomerSubInfoDTO> selectCustomerSubInfo(@Param("list") List<String> customerIds);
+    CustomerSubInfoDTO selectCustomerSubInfo(@Param("customerId")String customerId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java
index 018e215af1..440491f8a5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/crm/impl/CustomerRelationServiceImpl.java
@@ -22,11 +22,15 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.crm.CustomerRelationDao;
 import com.epmet.dto.indexcal.CustomerSubInfoDTO;
+import com.epmet.dto.stats.DimCustomerDTO;
 import com.epmet.entity.crm.CustomerRelationEntity;
 import com.epmet.service.crm.CustomerRelationService;
+import com.epmet.service.stats.DimCustomerService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -42,7 +46,8 @@ import java.util.stream.Collectors;
 @Service
 public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelationDao, CustomerRelationEntity> implements CustomerRelationService {
 
-
+    @Autowired
+    private DimCustomerService dimCustomerService;
     /**
      * @param customerIds
      * @return java.util.Map<java.lang.String, com.epmet.dto.indexcal.CustomerSubInfoDTO>
@@ -52,7 +57,17 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl<CustomerRelatio
      **/
     @Override
     public Map<String, CustomerSubInfoDTO> getCustomerInfoMap(List<String> customerIds) {
-        List<CustomerSubInfoDTO> list = baseDao.selectCustomerSubInfo(customerIds);
+        List<CustomerSubInfoDTO> list=new ArrayList<>();
+        for(String customerId:customerIds){
+            CustomerSubInfoDTO customerSubInfoDTO = baseDao.selectCustomerSubInfo(customerId);
+            if(null!=customerSubInfoDTO){
+                DimCustomerDTO dimCustomerDTO=dimCustomerService.get(customerId);
+                if(null!=dimCustomerDTO){
+                    customerSubInfoDTO.setCustomerName(dimCustomerDTO.getCustomerName());
+                }
+                list.add(customerSubInfoDTO);
+            }
+        }
         if(CollectionUtils.isEmpty(list)){
             return new HashMap<>();
         }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/crm/CustomerRelationDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/crm/CustomerRelationDao.xml
index b6d60ae9a4..a92c55e9f9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/crm/CustomerRelationDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/crm/CustomerRelationDao.xml
@@ -4,7 +4,6 @@
 <mapper namespace="com.epmet.dao.crm.CustomerRelationDao">
     <resultMap id="CustomerSubInfoDTOResMap" type="com.epmet.dto.indexcal.CustomerSubInfoDTO">
         <result property="customerId" column="customerId"></result>
-        <result property="customerName" column="customerName"></result>
         <result property="customerAreaCode" column="customerAreaCode"></result>
         <collection property="subCustomerIds" ofType="java.lang.String">
             <result column="subCustomerId"/>
@@ -14,22 +13,13 @@
     <select id="selectCustomerSubInfo" parameterType="map" resultMap="CustomerSubInfoDTOResMap">
         SELECT
             CR.PARENT_CUSTOMER_ID AS customerId,
-            dc.CUSTOMER_NAME AS customerName,
-            dc.AREA_CODE AS customerAreaCode,
-            CR.CUSTOMER_ID AS subCustomerId
+            CR.CUSTOMER_ID AS subCustomerId,
+            (select c.AREA_CODE  from customer_relation c where c.del_flag='0' and c.CUSTOMER_ID=#{customerId}) as customerAreaCode
         FROM
             customer_relation cr
-            LEFT JOIN dim_customer dc ON ( cr.PARENT_CUSTOMER_ID = DC.ID and dc.del_flag='0')
         WHERE
             cr.DEL_FLAG = '0'
             AND cr.`STATUS` = 'open'
-            AND cr.PARENT_CUSTOMER_ID != '0'
-            <if test="null !=list and list.size()>0">
-                AND cr.PARENT_CUSTOMER_ID IN
-                <foreach collection="list" item="customerId" index="index" open="(" close=")" separator=",">
-                    #{customerId}
-                </foreach>
-            </if>
-
+            AND cr.PARENT_CUSTOMER_ID =#{customerId}
     </select>
 </mapper>
\ No newline at end of file