From a38a5c7e5427a5999e8fb40ed353c2c3127e2023 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 21 三月 2024 18:09:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/core/utils/DateUtil.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/DateUtil.java
index 62a16ad..274ec82 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -50,7 +50,7 @@
try {
TimeZone tz = TimeZone.getTimeZone("Asia/Shanghai");
//TimeZone tz = TimeZone.getTimeZone("GMT-01");
- DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'+'z");
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'+'08:00");
df.setTimeZone(tz);
String nowAsISO = df.format(date);
return nowAsISO;
@@ -439,6 +439,19 @@
}
return "";
}
+
+ public static String getShortTimeToNull(Date date) {
+
+ if (date == null)
+ return null;
+ try {
+ String nowDate = sdfLong.format(date);
+ return nowDate;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return "";
+ }
/**
* Descrption:鍙栧緱褰撳墠鏃ユ湡,鏍煎紡涓�:yyyy-MM-dd HH:mm:ss
*
--
Gitblit v1.9.3