From 2bd2200f209ddb7bcc59b636d9de6f8b3f762958 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 23 四月 2020 10:00:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 bc95595..1e99bca 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java
@@ -103,6 +103,12 @@
return 0;
}
+ public static String formatDate(long time) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+ String date = sdf.format(new Date(time));
+ return date;
+ }
+
public static String formatDate(Date time) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
String date = sdf.format(time);
@@ -113,6 +119,16 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
String date = sdf.format(time);
return date;
+ }
+
+ public static String formatDateAddT(Date date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+ try {
+ return sdf.format(date);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
}
public static long convertToTimeTemp(String st, String format) {
@@ -138,6 +154,7 @@
}
return 0;
}
+
public static long convertDateToTemp2(String st) {
Date date = new Date();
--
Gitblit v1.8.0