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

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

@@ -562,8 +562,8 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
                 // 区直街道的总分 就是 治理能力
                 monthlyFormDTO.setIndexTotal(deptScore.getValue().get(i).getScore());
                 // 多余的权重，赋0
-                monthlyFormDTO.setPartyDevWeight(deptScore.getValue().get(i).getWeight());
-                monthlyFormDTO.setServiceAblityWeight(deptScore.getValue().get(i).getWeight());
+                monthlyFormDTO.setPartyDevWeight(new BigDecimal(NumConstant.ZERO));
+                monthlyFormDTO.setServiceAblityWeight(new BigDecimal(NumConstant.ZERO));
                 // 赋值 治理能力
                 monthlyFormDTO = this.setValueAbilityMonthlyFor(deptScore.getValue().get(i).getIndexCode(),
                         deptScore.getValue().get(i).getWeight(),