Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp

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

@@ -917,6 +917,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
     }
 
     public List<SubCommunityAvgResultDTO> disposeSubAvg(List<SubCommunityAvgResultDTO> avgScore, CalculateCommonFormDTO formDTO){
+        // 查询处parentAreaCode = xx的组织
         List<ScreenProjectOrgDailyDTO> orgIds = customerAgencyDao.selectAgencyByParentAreaCode(formDTO.getCustomerAreaCode());
         List<SubCommunityAvgResultDTO> subAvgScores = new ArrayList<>();
         orgIds.forEach(org -> {

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml

@@ -164,8 +164,7 @@
                 AND fics.index_code = #{indexCode}
                 )
         WHERE sca.DEL_FLAG = 0
-          AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
+        AND sca.PARENT_AREA_CODE = #{areaCode}
-          AND sca.`LEVEL` = 'community'
+        GROUP BY agencyId
-        GROUP BY parentId
     </select>
 </mapper>