From 81c5c0775379714f31843172efb8fd6d8b3b9c90 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 19 May 2021 17:42:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=85=88=E9=94=8B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=B1=95=E7=A4=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/PartyMemberVanguardRankResultDTO.java   |  5 +++++
 .../dataaggre/dao/datastats/DataStatsDao.java      |  2 ++
 .../datastats/impl/DataStatsServiceImpl.java       |  5 +++++
 .../resources/mapper/datastats/DatsStatsDao.xml    | 14 ++++++++++++++
 4 files changed, 26 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardRankResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardRankResultDTO.java
index 9d2f643229..57640eea9a 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardRankResultDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardRankResultDTO.java
@@ -13,6 +13,11 @@ import java.util.List;
 @Data
 public class PartyMemberVanguardRankResultDTO implements Serializable {
 	private static final long serialVersionUID = -3103242333633668412L;
+	/**
+	 *
+	 * 组织级别 社区级：community，乡（镇、街道）级:street，区县级: district，市级: city，省级:province
+	 */
+	private String agencyLevel;
 	private List<PartyMemberVanguardDetailResultDTO> agencyRank;
 	private List<PartyMemberVanguardDetailResultDTO> gridRank;
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
index 61632b35bd..02d6e72a76 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
@@ -226,4 +226,6 @@ public interface DataStatsDao {
                                                          @Param("dateId") String dateId,
                                                          @Param("orgId") String orgId,
                                                          @Param("actCategoryDictDTOList") List<ActCategoryDictDTO> actCategoryDictDTOList);
+
+    DimAgencyEntity getAgencyInfo(@Param("agencyId") String agencyId);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index 415b1e969b..9daf0c36ab 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -962,7 +962,11 @@ public class DataStatsServiceImpl implements DataStatsService {
      */
     @Override
     public PartyMemberVanguardRankResultDTO vanguardRank(PartyMemberVanguardFormDTO formDTO) {
+        //获取组织级别
+        DimAgencyEntity agency = dataStatsDao.getAgencyInfo(formDTO.getAgencyId());
+        //组织排行
         List<PartyMemberVanguardDetailResultDTO> agencyRank = dataStatsDao.selectAgencyVanguardRank(formDTO.getAgencyId());
+        //网格排行
         List<PartyMemberVanguardDetailResultDTO> gridRank = dataStatsDao.selectGridVanguardRank(formDTO.getAgencyId());
         PartyMemberVanguardRankResultDTO result = new PartyMemberVanguardRankResultDTO();
         result.setAgencyRank(CollectionUtils.isNotEmpty(agencyRank)?agencyRank:Collections.emptyList());
@@ -983,6 +987,7 @@ public class DataStatsServiceImpl implements DataStatsService {
             item.setProjectRatio(transform(item.getProjectRatio()));
             item.setProjectClosedRatio(transform(item.getProjectClosedRatio()));
         });
+        result.setAgencyLevel(agency.getLevel());
         return result;
     }
 
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 0b41cf0b15..1f1663bd49 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -598,4 +598,18 @@
                 AND m.ORG_ID = #{orgId}
         </foreach>
     </select>
+    <select id="getAgencyInfo" resultType="com.epmet.dataaggre.entity.datastats.DimAgencyEntity">
+        SELECT
+            ID,
+            AGENCY_NAME,
+            CUSTOMER_ID,
+            PID,
+            PIDS,
+            ALL_PARENT_NAME,
+            `LEVEL`
+        FROM
+            dim_agency
+        WHERE
+            ID = #{agencyId}
+    </select>
 </mapper>
\ No newline at end of file