修改工具类

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -40,16 +40,22 @@ public class DataChange {
      * @param data
      * @return
      */
-    public static BigDecimal
-    dataToBigDecimal(Object data){
+    public static BigDecimal dataToBigDecimal(Object data){
         if (data != null){
             if(data instanceof BigDecimal){
                 return (BigDecimal) data;
-            }else {
-                String s = String.valueOf(data);
-                if(!"".equals(s)){
-                    return new BigDecimal(s);
+            }else{
+                String str = String.valueOf(data);
+                BigDecimal decimal = null;
+                if(!"".equals(str)){
+                    try {
+                        decimal = new BigDecimal(str);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        return new BigDecimal(0);
+                    }
                 }
+                return decimal;
             }
         }
         return new BigDecimal(0);
@@ -63,8 +69,10 @@ public class DataChange {
     public static String dateToDayDate(Object date){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Date changeDate = null;
+        if(date == null)
+            return null;
         try{
-            changeDate = (Date) date;
+             changeDate = (Date) date;
         }catch (Exception e){
             e.printStackTrace();
         }
@@ -82,12 +90,7 @@ public class DataChange {
             for (String s : key) {
                 //从map中取 date的值 并转换成字符串类型的日期
                 String stringDate = dateToDayDate(map.get(s));
-                if(stringDate.length() == 0){
-                    break;
-                }else {
-                    //修改map中的值
-                    map.put(s, stringDate);
-                }
+                map.put(s, stringDate);
             }
         }
     }
@@ -152,4 +155,5 @@ public class DataChange {
         );
         return sb.toString();
     }
+
 }