From 752d00df1ac102f3645e0c98943ae18f8b7e9c3f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 14 五月 2020 16:58:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
index 1e99bca..e419487 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
@@ -86,11 +86,61 @@
date = sdf.parse(st);
return date.getTime();
} catch (Exception e) {
- // e.printStackTrace();
+ e.printStackTrace();
return 0;
}
}
-
+
+ public static Date parseYYYYMM(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ public static Date parseYYYYMMDD_HHMMSS(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ public static Date parseYYYYMMDD(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ public static Date parseDotYYYYMMDD(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ public static Date parseDotCommon(String st) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
+ try {
+ return sdf.parse(st);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
public static long convertAllTimeToTemp(String st) {
Date date = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
--
Gitblit v1.8.0