From 0d24ea21533d9135c8963a28d8d45bfd207b8ec6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 01 Jul 2021 14:17:22 +0800
Subject: [PATCH] update
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/util/DateUtils.java b/screen-common/src/main/java/com/moral/util/DateUtils.java
index f5ecd8a..1542852 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -1301,12 +1301,6 @@
return date;
}
- //������������������������������������
- public static Date convertDate(Date date) {
- String dateString = dateToDateString(date, yyyy_MM_dd_HH_mm_EN);
- return getDate(dateString, yyyy_MM_dd_HH_mm_EN);
- }
-
//���������������������������������
public static Date dataToTimeStampTime(Date time, String dateFormat) {
String dateString = dateToDateString(time, dateFormat);
@@ -1317,7 +1311,11 @@
}
}
- public static void main(String[] args) throws InterruptedException {
- System.out.println(new Date().getTime());
+ //���������������
+ public static Date geLastWeekMonday() {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(getDate(getMondayOfThisWeek(),yyyy_MM_dd_EN) );
+ cal.add(Calendar.DATE, -7);
+ return cal.getTime();
}
}
--
Gitblit v1.8.0