添加点注释

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/SubAgencyIndexRankResultDTO.java

@@ -37,4 +37,8 @@ public class SubAgencyIndexRankResultDTO implements Serializable {
      * 服务能力
      */
     private Double serviceAbility = 0.0;
+
+    private String orgId;
+    private String orgType;
+    private String areaCode;
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java

@@ -150,6 +150,14 @@ public interface ScreenCustomerAgencyDao {
      **/
     List<GridNodeDTO> selectGridList(@Param("areaCode") String areaCode,@Param("agencyId") String agencyId);
 
+    /**
+     * @return java.util.List<java.lang.String>
+     * @param areaCode
+     * @param agencyId
+     * @author yinzuomei
+     * @description 下一级组织+直属网格
+     * @Date 2021/5/10 14:02
+     **/
     List<String> getNextAgencyIds(@Param("areaCode")String areaCode,@Param("agencyId")String agencyId);
 
     List<String> selectSubAgencyIds(@Param("areaCode")String areaCode,@Param("agencyId")String agencyId);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java

@@ -303,7 +303,7 @@ public class AgencyServiceImpl implements AgencyService {
      * @param agencyId
      * @return java.util.List<java.lang.String>
      * @author yinzuomei
-     * @description 获取当前组织的下级组织集合
+     * @description 获取当前组织的下级组织集合:下一级组织+直属网格
      * @Date 2021/2/25 16:52
      **/
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java

@@ -67,6 +67,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService
     public PartymemberPercentResultDTO partymemberBaseInfo(ParymemberFormDTO param) {
         if(StringUtils.isNotBlank(param.getAreaCode())){
             logger.info(String.format("党员基本情况-饼状图概况按照areaCode查询：%s",param.getAreaCode()));
+            //下一级组织+直属网格
             List<String> ids=screenCustomerAgencyService.getNextAgencyIds(param.getAreaCode(),param.getAgencyId());
             if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(ids)){
                 PartymemberPercentResultDTO result = screenUserTotalDataDao.selectAgencyPartymemberPercentByIds(ids);

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java

@@ -404,6 +404,7 @@ public class IndexServiceImpl implements IndexService {
             List<SubAgencyIndexRankResultDTO> streetList = screenIndexDataMonthlyDao.selectSubStreetByAreaCode(formDTO.getCustomerId(),yearId,formDTO.getAreaCode(),formDTO.getTopNum());
             // 小数四舍五入
             streetList.forEach(indexRank -> {
+                indexRank.setOrgType("street");
                 indexRank.setPartyDevAbility(getRound(indexRank.getPartyDevAbility()));
                 indexRank.setGovernAbility(getRound(indexRank.getGovernAbility()));
                 indexRank.setServiceAbility(getRound(indexRank.getServiceAbility()));
@@ -414,6 +415,7 @@ public class IndexServiceImpl implements IndexService {
         List<SubAgencyIndexRankResultDTO> gridList = screenIndexDataMonthlyDao.selectSubGridByAreaCode(formDTO.getCustomerId(),yearId,formDTO.getAreaCode(),formDTO.getTopNum());
         // 小数四舍五入
         gridList.forEach(indexRank -> {
+            indexRank.setOrgType("grid");
             indexRank.setPartyDevAbility(getRound(indexRank.getPartyDevAbility()));
             indexRank.setGovernAbility(getRound(indexRank.getGovernAbility()));
             indexRank.setServiceAbility(getRound(indexRank.getServiceAbility()));

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@@ -272,6 +272,7 @@
             and grid.PARENT_AGENCY_ID=#{agencyId}
     </select>
 
+    <!--     下一级组织+直属网格 -->
     <select id="getNextAgencyIds" parameterType="map" resultType="java.lang.String">
         SELECT
             sca.AGENCY_ID as   orgId

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@@ -289,7 +289,9 @@
             sca.AGENCY_NAME AS NAME,
             sy.govern_ablity AS governAbility,
             sy.party_dev_ablity AS partyDevAbility,
-            sy.service_ablity AS serviceAbility
+            sy.service_ablity AS serviceAbility,
+            sy.ORG_ID as orgId,
+            sca.area_code as areaCode
         FROM screen_customer_agency sca
         left join screen_index_data_yearly sy
         on(sca.AGENCY_ID=sy.ORG_ID
@@ -310,7 +312,9 @@
             scg.GRID_NAME AS NAME,
             sy.govern_ablity AS governAbility,
             sy.party_dev_ablity AS partyDevAbility,
-            sy.service_ablity AS serviceAbility
+            sy.service_ablity AS serviceAbility,
+            sy.ORG_ID as orgId,
+            scg.area_code as areaCode
         FROM screen_customer_grid  scg
         left join screen_index_data_yearly sy
             on(scg.GRID_ID=sy.ORG_ID