diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java index 663690925c..8caba8bfa6 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java @@ -881,6 +881,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ } public List disposeSubAvg(List avgScore, CalculateCommonFormDTO formDTO){ + // 查询处parentAreaCode = xx的组织 List orgIds = customerAgencyDao.selectAgencyByParentAreaCode(formDTO.getCustomerAreaCode()); List subAvgScores = new ArrayList<>(); orgIds.forEach(org -> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml index a69f2838eb..b1a989e900 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml @@ -164,8 +164,9 @@ AND fics.index_code = #{indexCode} ) WHERE sca.DEL_FLAG = 0 - AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%') - AND sca.`LEVEL` = 'community' - GROUP BY parentId + -- AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%') + AND sca.PARENT_AREA_CODE = #{areaCode} + -- AND sca.`LEVEL` = 'community' + GROUP BY agencyId