From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 9 ++++++++-
1 files changed, 8 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 5a51ae9..cca005b 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -291,7 +291,7 @@
}
/**
- * ������dateTimeStr���Date������
+ * ������dateTimeStr���Date������ ������������
*
* @param dateTimeStr
* @return
@@ -1869,6 +1869,13 @@
String lastYear = getDateAddYear(DateUtils.dateToDateString(getDate(), DateUtils.yyyy), -1);
return DateUtils.getDate(lastYear, DateUtils.yyyy);
}
+ //������������������
+ public static Date getFirstDayOfLastYear(Date date) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.add(Calendar.YEAR, -1);
+ return calendar.getTime();
+ }
//���������������������������������������������������
public static Map<Date, List<Integer>> getBeforeAndAfterHourDate(Date date) {
--
Gitblit v1.8.0