From 6eb90049f284f63fe623c76cb0599d5c927c1a8a Mon Sep 17 00:00:00 2001
From: 吴学文 <wuxuewen@wuxuewendeMacBook-Pro.local>
Date: 星期一, 08 七月 2019 23:17:20 +0800
Subject: [PATCH] 映射保存处理
---
java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java b/java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java
index 500207e..3097711 100644
--- a/java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java
+++ b/java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java
@@ -33,16 +33,24 @@
Date date1 = null;
if (value instanceof String) {
String date = (String) value;
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat sdf = null;
+ if (date.contains(":")) {
+ sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ } else {
+ sdf = new SimpleDateFormat("yyyy-MM-dd");
+ }
try {
date1 = sdf.parse(date);
} catch (ParseException e) {
e.printStackTrace();
}
+ return date1;
}
- return date1;
+ return value;
}
}, Date.class);
+
+ ConvertUtils.register(new Java110StringConvert(), String.class);
}
--
Gitblit v1.8.0