社区相关

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/FactIndexGridScoreDao.java

@@ -46,24 +46,6 @@ public interface FactIndexGridScoreDao extends BaseDao<FactIndexGridScoreEntity>
      */
     List<SubGridAvgResultDTO> selectSubGridAvgScore(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode);
 
-    /**
-     * @Description  社区下属所有网格治理能力汇总平均值
-     * @param customerId
-     * @param monthId
-     * @author zxc
-     * @date 2020/8/31 9:19 上午
-     */
-    List<SubGridGovernAvgResultDTO> selectSubGridGovernAvgScore(@Param("customerId")String customerId, @Param("monthId")String monthId);
-
-    /**
-     * @Description  社区下级所有网格服务能力得分平均值
-     * @param customerId
-     * @param monthId
-     * @author zxc
-     * @date 2020/8/31 1:51 下午
-     */
-    List<SubGridServiceAvgResultDTO> selectSubGridServiceAvgScore(@Param("customerId")String customerId, @Param("monthId")String monthId);
-
     /**
      * 根据入参查询  网格相关分值记录
      * @param customerId

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java

@@ -166,6 +166,10 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.SHE_QU_XIA_SHU_SYWGZLNLHZPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubGridAvgResultDTO> subGridGovernAvg = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
+                if (CollectionUtils.isEmpty(subGridGovernAvg)){
+                    log.error("社区下级治理能力平均分集合为空");
+                    return;
+                }
                 if (subGridGovernAvg.size() == NumConstant.ONE) {
                     pid.put(subGridGovernAvg.get(NumConstant.ZERO).getAgencyId(),subGridGovernAvg.get(NumConstant.ZERO).getParentId());
                     sizeOne(subGridGovernAvg.get(NumConstant.ZERO).getAgencyId(),customerId,monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),pid);