Merge branch 'f-6.7.0' of 192.168.10.6:caosy/fun-common into f-6.7.0

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/statistics/BaseStatisticsBean.java

@@ -83,7 +83,7 @@ public class BaseStatisticsBean implements Serializable {
         if (isZeroOrNull(dividend) || isZeroOrNull(divisor)) {
         if (isZeroOrNull(dividend) || isZeroOrNull(divisor)) {
             return BigDecimal.ZERO;
             return BigDecimal.ZERO;
         } else {
         } else {
-            return dividend.divide(new BigDecimal(divisor), 2, BigDecimal.ROUND_HALF_UP);
+            return dividend.divide(new BigDecimal(divisor.intValue()), 2, BigDecimal.ROUND_HALF_UP);
 
 
         }
         }
     }
     }
@@ -92,7 +92,7 @@ public class BaseStatisticsBean implements Serializable {
         if (isZeroOrNull(dividend) || isZeroOrNull(divisor)) {
         if (isZeroOrNull(dividend) || isZeroOrNull(divisor)) {
             return BigDecimal.ZERO;
             return BigDecimal.ZERO;
         } else {
         } else {
-            return new BigDecimal(dividend).divide(new BigDecimal(divisor), 2, BigDecimal.ROUND_HALF_UP);
+            return new BigDecimal(dividend.intValue()).divide(new BigDecimal(divisor.intValue()), 2, BigDecimal.ROUND_HALF_UP);
         }
         }
     }
     }
     /**
     /**