From 6450fec60b8dc7e6d31779bcfe3b23b3f665ebaf Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 28 Dec 2021 15:08:45 +0800
Subject: [PATCH] screen-api 更新单位转换代码
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 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 8d792d2..8889611 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -940,12 +940,52 @@
}
/*
- * ������������������������
- * */
- public static Date getFirstDayOfCurrYear(){
+ * ������������������������
+ * */
+ public static Date getFirstDayOfCurrYear() {
Calendar cal = Calendar.getInstance();
- cal.set(Calendar.DAY_OF_YEAR,1);
+ cal.set(Calendar.DAY_OF_YEAR, 1);
return getDate(dateToDateString(cal.getTime(), yyyy_MM_dd_EN));
+ }
+
+ /*
+ * ������������������������������
+ * */
+ public static Date getFirstDayOfYear(Date date) {
+ final Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ final int last = cal.getActualMinimum(Calendar.DAY_OF_YEAR);
+ cal.set(Calendar.DAY_OF_YEAR, last);
+ cal.set(Calendar.HOUR_OF_DAY,0);
+ cal.set(Calendar.MINUTE,0);
+ cal.set(Calendar.SECOND,0);
+ return cal.getTime();
+ }
+
+ /*
+ * ���������������������������������
+ * */
+ public static Date getLastDayOfYear(Date date) {
+ final Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ final int last = cal.getActualMaximum(Calendar.DAY_OF_YEAR);
+ cal.set(Calendar.DAY_OF_YEAR, last);
+ cal.set(Calendar.HOUR_OF_DAY, 23);
+ cal.set(Calendar.MINUTE, 59);
+ cal.set(Calendar.SECOND, 59);
+ return cal.getTime();
+ }
+
+ /*
+ * ���������������������������
+ * */
+ public static boolean isCurrentYear(Date date) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(new Date());
+ int currentYear = cal.get(Calendar.YEAR);
+ cal.setTime(date);
+ int year = cal.get(Calendar.YEAR);
+ return year == currentYear;
}
/**
@@ -1040,9 +1080,9 @@
}
/*
- * ������������Date
- * */
- public static Date getYesterdayDate(){
+ * ������������Date
+ * */
+ public static Date getYesterdayDate() {
Calendar cal = Calendar.getInstance();
cal.setTime(new Date());
cal.set(Calendar.HOUR_OF_DAY, 0);
@@ -1769,7 +1809,6 @@
//������������Date
public static Date getFirstDayOfLastYear() {
String lastYear = getDateAddYear(DateUtils.dateToDateString(getDate(), DateUtils.yyyy), -1);
- System.out.println(DateUtils.getDate(lastYear, DateUtils.yyyy));
return DateUtils.getDate(lastYear, DateUtils.yyyy);
}
}
--
Gitblit v1.8.0