From 3a51a59dde5dd99e9eee3f0ce2ffbb504057a4d9 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Sun, 25 Jun 2023 09:55:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=9E=8B=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E6=97=B6=E6=9C=89,=E5=87=BA=E9=94=99=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../utils/ObjectFormatUtil.java               | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/utils/ObjectFormatUtil.java b/src/main/java/com/dreamchaser/depository_manage/utils/ObjectFormatUtil.java
index 300c72bb..801c57ac 100644
--- a/src/main/java/com/dreamchaser/depository_manage/utils/ObjectFormatUtil.java
+++ b/src/main/java/com/dreamchaser/depository_manage/utils/ObjectFormatUtil.java
@@ -8,36 +8,56 @@ import java.math.BigDecimal;
 public class ObjectFormatUtil {
     /**
      * 一种较为安全的Object转换Integer方式
+     *
      * @param o 要转化的对象
      * @return 转化的Integer类型结果
      */
-    public static Integer toInteger(Object o){
-        return o==null?null:Integer.parseInt(o.toString());
+    public static Integer toInteger(Object o) {
+        if (o == null) {
+            return null;
+        }
+        String s = o.toString();
+        s = s.replaceAll(",", "");
+        return Integer.parseInt(s);
     }
+
     /**
      * 一种较为安全的Object转换Long方式
+     *
      * @param o 要转化的对象
      * @return 转化的Long类型结果
      */
-    public static Long toLong(Object o){
-        return o==null?null:Long.parseLong(o.toString());
+    public static Long toLong(Object o) {
+        if (o == null) {
+            return null;
+        }
+        String s = o.toString();
+        s = s.replaceAll(",", "");
+        return Long.parseLong(s);
     }
 
-    public static Boolean toBoolean(Object o){
-        return  (o==null)?null:Boolean.parseBoolean(o.toString());
+    public static Boolean toBoolean(Object o) {
+        return (o == null) ? null : Boolean.parseBoolean(o.toString());
     }
 
-    public static Double toDouble(Object o){return (o == null)?null:Double.parseDouble(o.toString());}
+    public static Double toDouble(Object o) {
+        if (o == null) {
+            return null;
+        }
+        String s = o.toString();
+        s = s.replaceAll(",", "");
+        return Double.parseDouble(s);
+    }
 
     // double类型相加
-    public static double sum(double d1,double d2){
+    public static double sum(double d1, double d2) {
         BigDecimal bd1 = new BigDecimal(Double.toString(d1));
         BigDecimal bd2 = new BigDecimal(Double.toString(d2));
         return bd1.add(bd2).doubleValue();
     }
 
     // double 类型相乘
-    public static double multiply(double d1,double d2){
+    public static double multiply(double d1, double d2) {
         BigDecimal bd1 = new BigDecimal(Double.toString(d1));
         BigDecimal bd2 = new BigDecimal(Double.toString(d2));
         return bd1.multiply(bd2).doubleValue();