From 505aa8be1495d07ee0974f7eb4b34a945fa12c7f Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Sat, 12 Sep 2020 15:12:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexcal/impl/CpcIndexCalculateServiceImpl.java            | 3 +--
 .../evaluationindex/indexcal/impl/DeptScoreServiceImpl.java    | 2 +-
 .../indexcal/impl/GridCorreLationServiceImpl.java              | 2 +-
 .../indexcal/impl/IndexCalculateDistrictServiceImpl.java       | 2 ++
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java
index 2eacb84ef6..0de8be20fc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java
@@ -266,8 +266,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
                 cpcScoreEntity.setScore(new BigDecimal(NumConstant.ZERO));
                 cpcScoreEntity.setIndexCode(parentIndexCode);
                 cpcScoreEntity.setAllParentIndexCode(value.getAllParentIndexCode());
-                String vallPath = value.getAllParentIndexCode().concat(StrConstant.COLON).concat(parentIndexCode);
-                BigDecimal weight = indexGroupDetailService.getWeightByAllPathIndexCode(formDTO.getCustomerId(), vallPath);
+                BigDecimal weight = indexGroupDetailService.getWeightByAllPathIndexCode(formDTO.getCustomerId(), value.getAllParentIndexCode());
                 cpcScoreEntity.setWeight(weight);
                 scoreEntityMap.put(userId, cpcScoreEntity);
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java
index fabd8d515e..9355c6f79e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java
@@ -311,7 +311,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
             //区直部门治理能力的 上一级是 quzhibumen
             ////新增ALL_PARENT_INDEX_CODE 所有指标code拼接的字符串 冒号隔开
             deptScoreEntity.setAllParentIndexCode(IndexCodeEnum.QU_ZHI_BU_MEN.getCode());
-            String allPath = deptScoreEntity.getAllParentIndexCode().concat(StrConstant.COLON).concat(IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
+            String allPath = deptScoreEntity.getAllParentIndexCode().concat(StrConstant.COLON).concat(deptScoreEntity.getIndexCode());
             BigDecimal weight = indexGroupDetailService.getWeightByAllPathIndexCode(formDTO.getCustomerId(), allPath);
             deptScoreEntity.setWeight(weight);
             deptScoreEntityList.add(deptScoreEntity);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
index 218de3aa07..a09f37d2f4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
@@ -366,7 +366,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                 gridScoreEntity.setScore(calculateResult.getTotalScore());
                 //新增ALL_PARENT_INDEX_CODE 所有指标code拼接的字符串 冒号隔开
                 gridScoreEntity.setAllParentIndexCode(IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode());
-                BigDecimal weight = indexGroupDetailService.getWeightByAllPathIndexCode(formDTO.getCustomerId(), IndexCodeEnum.WANG_GE_XIANG_GUAN.getCode());
+                BigDecimal weight = indexGroupDetailService.getWeightByAllPathIndexCode(formDTO.getCustomerId(), gridScoreEntity.getAllParentIndexCode().concat(StrConstant.COLON).concat(gridScoreEntity.getIndexCode()));
                 gridScoreEntity.setWeight(weight);
                 gridScoreEntityList.add(gridScoreEntity);
                 for (IndexScoreVo detail : calculateResult.getDetails()) {
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
index c3fc5684bf..af5300940f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
@@ -322,6 +322,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
             score.setDataType(IndexCalConstant.DISTRICT_LEVEL);
             score.setIndexCode(IndexCodeEnum.QUAN_QU_XIANG_GUAN.getCode());
             score.setAllParentIndexCode(NumConstant.ZERO_STR);
+            BigDecimal weight = indexGroupDetailService.getWeightByAllPathIndexCode(customerId, score.getAllParentIndexCode().concat(StrConstant.COLON).concat(score.getIndexCode()));
+            score.setWeight(weight);
             value.forEach(community -> {
                 score.setScore(score.getScore().add(community.getScore()));
                 score.setParentAgencyId(community.getParentAgencyId());