Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/IndexDataMonthlyFormDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.screencoll.form;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -71,15 +72,15 @@ public class IndexDataMonthlyFormDTO implements Serializable {
     /**
      * 党建能力指数权重
      */
-    private BigDecimal partyDevWeight;
+    private BigDecimal partyDevWeight = new BigDecimal(NumConstant.ZERO);
 
     /**
      *  服务能力指数 权重
      */
-    private BigDecimal serviceAblityWeight;
+    private BigDecimal serviceAblityWeight = new BigDecimal(NumConstant.ZERO);
 
     /**
      * 治理能力分数，权重
      */
-    private BigDecimal governAblityWeight;
+    private BigDecimal governAblityWeight = new BigDecimal(NumConstant.ZERO);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java

@@ -375,6 +375,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                     gridSubScoreEntity.setIndexCode(detail.getIndexCode());
                     gridSubScoreEntity.setAllParentIndexCode(detail.getAllParentIndexCode());
                     gridSubScoreEntity.setScore(detail.getScore());
+                    gridSubScoreEntity.setWeight(detail.getWeight());
                     gridSubScoreList.add(gridSubScoreEntity);
                 }
             });

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java

@@ -561,6 +561,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             for ( int i = 0; i < deptScore.getValue().size(); i++){
                 // 区直街道的总分 就是 治理能力
                 monthlyFormDTO.setIndexTotal(deptScore.getValue().get(i).getScore());
+                // 多余的权重，赋0
+                monthlyFormDTO.setPartyDevWeight(deptScore.getValue().get(i).getWeight());
+                monthlyFormDTO.setServiceAblityWeight(deptScore.getValue().get(i).getWeight());
                 // 赋值 治理能力
                 monthlyFormDTO = this.setValueAbilityMonthlyFor(deptScore.getValue().get(i).getIndexCode(),
                         deptScore.getValue().get(i).getWeight(),