From 8f4a84103e75c8a3a969547671a8eb8c27139390 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 10 Nov 2021 17:23:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E9=A1=B9=E7=9B=AE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8A=E6=8A=A5=20ALL=5FPARENT=5FIDS=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B9=B3=E9=98=B4=E7=9A=84=E7=BB=84=E7=BB=87ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenCustomerAgencyDao.java             |  2 ++
 .../screen/ScreenCustomerAgencyService.java         |  9 +++++++++
 .../impl/ScreenCustomerAgencyServiceImpl.java       | 13 +++++++++++++
 .../screen/impl/ScreenProjectDataServiceImpl.java   |  7 +++++++
 .../screen/ScreenCustomerAgencyDao.xml              | 11 +++++++++++
 5 files changed, 42 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
index 84f989ddf9..619e9f2e67 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java
@@ -254,4 +254,6 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
      */
     List<GridAndOrgCategoryCountResultDTO> selectParentSonAgency(@Param("customerIds") List<String> customerIds ,@Param("customerId") String customerId);
 
+
+    String getParentAgencyId(@Param("agencyId") String agencyId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerAgencyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerAgencyService.java
index fcb81fc243..9a46990c1d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerAgencyService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerAgencyService.java
@@ -155,4 +155,13 @@ public interface ScreenCustomerAgencyService extends BaseService<ScreenCustomerA
      */
     Map<String, ScreenCustomerAgencyEntity> getAgencyList(String customerId);
 
+    /**
+     * @Description 获取父级组织ID（外部客户）
+     * @Param agencyId
+     * @Return {@link String}
+     * @Author zhaoqifeng
+     * @Date 2021/11/10 17:00
+     */
+    String getParentAgencyId(String agencyId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
index 7f11df187a..e8f8f9bb39 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java
@@ -335,4 +335,17 @@ public class ScreenCustomerAgencyServiceImpl extends BaseServiceImpl<ScreenCusto
         return list.stream().collect(Collectors.toMap(ScreenCustomerAgencyEntity::getAgencyId, Function.identity()));
     }
 
+    /**
+     * @param agencyId
+     * @Description 获取父级组织ID（外部客户）
+     * @Param agencyId
+     * @Return {@link String}
+     * @Author zhaoqifeng
+     * @Date 2021/11/10 17:00
+     */
+    @Override
+    public String getParentAgencyId(String agencyId) {
+        return baseDao.getParentAgencyId(agencyId);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
index 047602128f..d5b114852a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
@@ -42,6 +42,7 @@ import com.epmet.entity.stats.CustomerProjectCategoryDictEntity;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.OperCrmOpenFeignClient;
 import com.epmet.send.SendMqMsgUtil;
+import com.epmet.service.evaluationindex.screen.ScreenCustomerAgencyService;
 import com.epmet.service.evaluationindex.screen.ScreenProjectCategoryService;
 import com.epmet.service.evaluationindex.screen.ScreenProjectDataService;
 import com.epmet.service.stats.CustomerProjectCategoryDictService;
@@ -79,6 +80,8 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
     private CustomerProjectCategoryDictService customerProjectCategoryDictService;
     @Resource
     private OperCrmOpenFeignClient operCrmOpenFeignClient;
+    @Resource
+    private ScreenCustomerAgencyService screenCustomerAgencyService;
 
     @Override
     public PageData<ScreenProjectDataDTO> page(Map<String, Object> params) {
@@ -208,6 +211,10 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
             ScreenProjectDataEntity screenProjectDataEntity = ConvertUtils.sourceToTarget(item, ScreenProjectDataEntity.class);
             screenProjectDataEntity.setCustomerId(param.getCustomerId());
             screenProjectDataEntity.setDataEndTime(param.getDateId());
+            String agencyId = screenCustomerAgencyService.getParentAgencyId(screenProjectDataEntity.getAllParentIds().split(StrConstant.COMMA)[0]);
+            if(StringUtils.isNotBlank(agencyId)) {
+                screenProjectDataEntity.setAllParentIds(agencyId.concat(StrConstant.COMMA).concat(screenProjectDataEntity.getAllParentIds()));
+            }
             baseDao.insert(screenProjectDataEntity);
             projectList.add(screenProjectDataEntity);
             //插入图片表
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
index df067fcab1..75ec0bb250 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml
@@ -504,6 +504,17 @@
             del_flag = 0
           AND customer_id = #{customerId}
     </select>
+    <select id="getParentAgencyId" resultType="java.lang.String">
+        SELECT
+            a.AGENCY_ID
+        FROM
+            screen_customer_agency a
+            INNER JOIN screen_customer_agency b ON a.AREA_CODE = b.PARENT_AREA_CODE
+            AND b.DEL_FLAG = '0'
+            AND b.AGENCY_ID = #{agencyId}
+        WHERE
+            a.DEL_FLAG = '0'
+    </select>
 
     <!-- 查询父子客户的组织【平阴】 -->
     <select id="selectParentSonAgency" resultType="com.epmet.dto.screen.result.GridAndOrgCategoryCountResultDTO">