From 5776cbc5f2f31f3e939cbbf792d257620f03eb89 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 15 Jul 2021 11:54:23 +0800
Subject: [PATCH] screen-api 修改删除转换公式BUG
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 1542852..5fde952 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -1312,10 +1312,18 @@
}
//���������������
- public static Date geLastWeekMonday() {
+ public static Date getLastWeekMonday() {
Calendar cal = Calendar.getInstance();
- cal.setTime(getDate(getMondayOfThisWeek(),yyyy_MM_dd_EN) );
+ cal.setTime(getDate(getMondayOfThisWeek(), yyyy_MM_dd_EN));
cal.add(Calendar.DATE, -7);
return cal.getTime();
}
+
+ //���������������������
+ public static Date getFirstDayOfLastMonth() {
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.MONTH, -1);
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ return getDate(dateToDateString(calendar.getTime(), yyyy_MM_dd_EN));
+ }
}
--
Gitblit v1.8.0