自身和下级分数需要权重 没有原始值

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()));

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()));

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()));

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()));

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()));