From 7144c93e87cde08437d6201c702407256a386ad7 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Thu, 24 Sep 2020 21:12:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E8=BA=AB=E5=92=8C=E4=B8=8B=E7=BA=A7?=
 =?UTF-8?q?=E5=88=86=E6=95=B0=E9=9C=80=E8=A6=81=E6=9D=83=E9=87=8D=20?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8E=9F=E5=A7=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 8f4a1f1ef8..33246cad86 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
@@ -161,7 +161,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
                     scoreEntity.setSelfWeight(new BigDecimal(0));
                     scoreEntity.setSubWeight(new BigDecimal(0));
                 }
-                BigDecimal partScore = score.getScore();
+                BigDecimal partScore = score.getScore().multiply(score.getWeight());
                 if (selfSubParentMap.get(ProjectConstant.XIA_JI).contains(score.getIndexCode())) {
                     scoreEntity.setSubScore(scoreEntity.getSubScore().add(partScore));
                     scoreEntity.setSubWeight(scoreEntity.getSubWeight().add(score.getWeight()));
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 f65ff5ffb1..dd000900d3 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
@@ -151,7 +151,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                     scoreEntity.setSelfWeight(new BigDecimal(0));
                     scoreEntity.setSubWeight(new BigDecimal(0));
                 }
-                BigDecimal partScore = score.getScore();
+                BigDecimal partScore = score.getScore().multiply(score.getWeight());
                 if (selfSubParentMap.get(ProjectConstant.XIA_JI).contains(score.getIndexCode())) {
                     scoreEntity.setSubScore(scoreEntity.getSubScore().add(partScore));
                     scoreEntity.setSubWeight(scoreEntity.getSubWeight().add(score.getWeight()));
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
index 07db8a8822..5d9523550c 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
@@ -159,7 +159,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                     scoreEntity.setSelfWeight(new BigDecimal(0));
                     scoreEntity.setSubWeight(new BigDecimal(0));
                 }
-                BigDecimal partScore = score.getScore();
+                BigDecimal partScore = score.getScore().multiply(score.getWeight());
                 if (selfSubParentMap.get(ProjectConstant.XIA_JI).contains(score.getIndexCode())) {
                     scoreEntity.setSubScore(scoreEntity.getSubScore().add(partScore));
                     scoreEntity.setSubWeight(scoreEntity.getSubWeight().add(score.getWeight()));
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 a7e1fac331..80163e8646 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
@@ -157,7 +157,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                     scoreEntity.setSelfWeight(new BigDecimal(0));
                     scoreEntity.setSubWeight(new BigDecimal(0));
                 }
-                BigDecimal partScore = score.getScore();
+                BigDecimal partScore = score.getScore().multiply(score.getWeight());
                 if (selfSubParentMap.get(ProjectConstant.XIA_JI).contains(score.getIndexCode())) {
                     scoreEntity.setSubScore(scoreEntity.getSubScore().add(partScore));
                     scoreEntity.setSubWeight(scoreEntity.getSubWeight().add(score.getWeight()));
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 b4808fabee..88d329ca6b 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
@@ -160,7 +160,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                     scoreEntity.setSelfWeight(new BigDecimal(0));
                     scoreEntity.setSubWeight(new BigDecimal(0));
                 }
-                BigDecimal partScore = score.getScore();
+                BigDecimal partScore = score.getScore().multiply(score.getWeight());
                 if (selfSubParentMap.get(ProjectConstant.XIA_JI).contains(score.getIndexCode())) {
                     scoreEntity.setSubScore(scoreEntity.getSubScore().add(partScore));
                     scoreEntity.setSubWeight(scoreEntity.getSubWeight().add(score.getWeight()));