From 9af3fbc6e67914cd4bf146effb0418ed4984ddbf Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 28 May 2021 13:28:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=97=E9=81=93=20=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E6=8C=87=E6=95=B0=E8=AE=A1=E7=AE=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../indexcal/impl/IndexCalculateStreetServiceImpl.java | 1 + .../mapper/evaluationindex/indexcal/CommunityScoreDao.xml | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) 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