From a867557192408a8ea7050b40b8dd157054146430 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 19 三月 2021 17:26:05 +0800
Subject: [PATCH] 更新 部分电池数据统计接口

---
 src/main/java/com/whyc/util/MathUtil.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/util/MathUtil.java b/src/main/java/com/whyc/util/MathUtil.java
index 7c450cc..8f66461 100644
--- a/src/main/java/com/whyc/util/MathUtil.java
+++ b/src/main/java/com/whyc/util/MathUtil.java
@@ -8,9 +8,15 @@
  */
 public class MathUtil {
 
-    /**鎻愬彇鍏叡鏂规硶,鐩搁櫎鑾峰彇姣斾緥*/
-    public static String divide(int num,int num2){
-        double res = BigDecimal.valueOf(num).divide(BigDecimal.valueOf(num2), 2, RoundingMode.HALF_UP).doubleValue();
+    /**
+     * 鎻愬彇鍏叡鏂规硶,鐩搁櫎鑾峰彇姣斾緥,杩斿洖鍙�塖tring鎴栬�匜loat
+     * @return Object String鎴栬�匜loat绫诲瀷
+     * */
+    public static Object divide(Object num,Object num2,boolean isFloat){
+        float res = BigDecimal.valueOf((Float) num).divide(BigDecimal.valueOf((Float) num2), 2, RoundingMode.HALF_UP).floatValue();
+        if(isFloat){
+            return res;
+        }
         return (int)(res*100)+"%";
     }
 

--
Gitblit v1.9.1