From 9c1f78cb828c14632e802b8f0d333196c6972544 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 9 Mar 2021 20:08:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenCustomerAgencyDao.java              |  1 +
 .../impl/IndexCalculateDistrictServiceImpl.java      | 12 ++++++++++++
 .../screen/ScreenCustomerAgencyDao.xml               |  8 ++++++++
 3 files changed, 21 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 44eeb11fa6..2953077792 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
@@ -95,6 +95,7 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
      * @date 2020/9/8 3:36 下午
      */
     String selectPid(@Param("agencyId") String agencyId);
+    String selectParentId(@Param("agencyId") String agencyId);
 
     /**
      * 返回当前客户下，未匹配到的 【乡（镇、街道）级、区县级】 组织信息
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
index 66beab2f9e..f8d6c6d3f7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
@@ -617,6 +617,10 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         indexDetailList.forEach(detail -> {
             if (IndexCodeEnum.QU_XIA_JI_JIE_DDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubAgencyScoreAvgResultDTO> subGridPartyAvgScore = agencyScoreDao.selectAgencyScoreAvgByOrgIds(monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),orgInfos.stream().map(o -> o.getOrgId()).collect(Collectors.toList()));
+                // 暂时的
+                subGridPartyAvgScore.forEach(s -> {
+                    s.setParentId(customerAgencyDao.selectParentId(s.getAgencyId()));
+                });
                 log.info("subGridPartyAvgScore:::"+subGridPartyAvgScore.toString());
                 if (CollectionUtils.isEmpty(subGridPartyAvgScore)) {
                     log.warn(IndexCalConstant.DISTRICT_PARTY_AVG_NULL);
@@ -703,6 +707,10 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             if (IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode().equals(detail.getIndexCode())) {
 //                List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSub(monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL,form.getCustomerAreaCode(),NumConstant.SIX);
                 List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvgByOrgIds(monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),orgInfos.stream().map(m -> m.getOrgId()).collect(Collectors.toList()));
+                // 暂时的
+                districtGovernAvgList.forEach(s -> {
+                    s.setParentId(customerAgencyDao.selectParentId(s.getAgencyId()));
+                });
                 log.info("districtGovernAvgList:::"+districtGovernAvgList.toString());
                 log.info(districtGovernAvgList.toString());
                 for (int i = 0; i < districtGovernAvgList.size(); i++) {
@@ -794,6 +802,10 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             if (IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode().equals(indexCode)) {
 //                List<SubAgencyScoreAvgResultDTO> subStreetAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSub(monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL,form.getCustomerAreaCode(),NumConstant.SIX);
                 List<SubAgencyScoreAvgResultDTO> subStreetAvgList = agencyScoreDao.selectAgencyScoreAvgByOrgIds(monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),orgInfos.stream().map(m -> m.getOrgId()).collect(Collectors.toList()));
+                // 暂时的
+                subStreetAvgList.forEach(s -> {
+                    s.setParentId(customerAgencyDao.selectParentId(s.getAgencyId()));
+                });
                 log.info("subStreetAvgList:::"+subStreetAvgList.toString());
                 for (int i = 0; i < subStreetAvgList.size(); i++) {
                     if (subStreetAvgList.get(i).getAgencyId().equals(NumConstant.ZERO_STR)){
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 5552a9df4b..13d48fe24c 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
@@ -404,4 +404,12 @@
         WHERE DEL_FLAG = 0
           and sca.PARENT_AREA_CODE = #{areaCode}
     </select>
+    <select id="selectParentId" resultType="java.lang.String">
+        select sca.AGENCY_ID from screen_customer_agency sca
+        where sca.AREA_CODE=
+              (
+                  select m.PARENT_AREA_CODE from screen_customer_agency m
+                  where m.AGENCY_ID=#{agencyId}
+              )
+    </select>
 </mapper>