From 5b8a81b9e7bb05f4692e4fa930bb9119c6711dad Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 01 Jul 2021 16:58:38 +0800
Subject: [PATCH] screen-manage 添加根据组织id和地区码获取设备接口
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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..99a7243 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -1314,8 +1314,16 @@
//���������������
public static Date geLastWeekMonday() {
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