Merge branch 'dev_third_data' into dev_temp

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;
 }

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);
 }

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;
     }
 

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>