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();