Merge remote-tracking branch 'origin/master'

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

@@ -879,10 +879,10 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
                         m.setServiceAblity(monthCountBd.multiply(m.getServiceAblity()));
                         m.setGovernAblity(monthCountBd.multiply(m.getGovernAblity()));
                     }else {
-                        m.setIndexTotal(monthCountBd.multiply(m.getIndexTotal()).divide(selfCount));
+                        m.setIndexTotal(monthCountBd.multiply(m.getIndexTotal()).divide(selfCount,NumConstant.SIX,BigDecimal.ROUND_HALF_UP));
-                        m.setPartyDevAblity(monthCountBd.multiply(m.getPartyDevAblity()).divide(selfCount));
+                        m.setPartyDevAblity(monthCountBd.multiply(m.getPartyDevAblity()).divide(selfCount,NumConstant.SIX,BigDecimal.ROUND_HALF_UP));
-                        m.setServiceAblity(monthCountBd.multiply(m.getServiceAblity()).divide(selfCount));
+                        m.setServiceAblity(monthCountBd.multiply(m.getServiceAblity()).divide(selfCount,NumConstant.SIX,BigDecimal.ROUND_HALF_UP));
-                        m.setGovernAblity(monthCountBd.multiply(m.getGovernAblity()).divide(selfCount));
+                        m.setGovernAblity(monthCountBd.multiply(m.getGovernAblity()).divide(selfCount,NumConstant.SIX,BigDecimal.ROUND_HALF_UP));
                     }
                 }
             });