From 0bac87005199be1c535b36b031b2b8f59e1461c0 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 15 五月 2024 09:41:48 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index 2ccb323..d68a093 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -1876,11 +1876,10 @@
}
public static int compareDate(String format, String str1, Date date2) {
-
Date date1 = null;
try {
date1 = fromStringToDate(format, str1);
- } catch (ParseException e) {
+ } catch (Exception e) {
// TODO 鑷姩鐢熸垚 catch 鍧�
e.printStackTrace();
}
@@ -2785,7 +2784,7 @@
stringDate = getFomartDate(new Date(now), formate);
- } catch (ParseException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
@@ -2800,8 +2799,7 @@
long now = date.getTime() + (long) Integer.parseInt(days) * DAY_IN_MILLISECOND;
date = new Date(now);
-
- } catch (ParseException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
@@ -2818,10 +2816,16 @@
*
* 瀛楃涓插舰寮忚浆鍖栦负Date绫诲瀷 String绫诲瀷鎸夌収format鏍煎紡杞负Date绫诲瀷
**/
- public static Date fromStringToDate(String format, String dateTime) throws ParseException {
+ public static Date fromStringToDate(String format, String dateTime) {
Date date = null;
- SimpleDateFormat sdf = new SimpleDateFormat(format);
- date = sdf.parse(dateTime);
+ try {
+
+ SimpleDateFormat sdf = new SimpleDateFormat(format);
+ date = sdf.parse(dateTime);
+ }catch (Exception e){
+
+ }
+
return date;
}
--
Gitblit v1.9.3