From 4a64c0801f147536ed0a9d09977941f313a286ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 18 Aug 2023 16:19:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into wb
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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 5de2f15..e725576 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -507,6 +507,14 @@
}
}
+ public static boolean isTimeBeforE(Date nows, Date date) {
+ long hous = nows.getTime() - date.getTime();
+ if (hous >= 0) {
+ return true;
+ } else {
+ return false;
+ }
+ }
/**
* ������������������������������������������������������
*
@@ -620,6 +628,22 @@
now.setTime(getDate(date, formatStr));
now.add(Calendar.DATE, day);
return dateToDateString(now.getTime(), formatStr);
+ }
+
+
+ /**
+ * ������������������day���������������(formatStr)������������
+ *
+ * @param date
+ * @param date,
+ * @param hours
+ * @return
+ */
+ public static Date getDateAddHour(Date date,int hours) {
+ Calendar now = Calendar.getInstance(TimeZone.getDefault());
+ now.setTime(date);
+ now.add(Calendar.HOUR_OF_DAY, hours);
+ return now.getTime();
}
/**
@@ -1048,6 +1072,14 @@
return getDate(dateToDateString(cal.getTime(), yyyy_MM_dd_EN));
}
+ public static Date getLastDayOfCurrMonth(Date time) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(time);
+ cal.add(Calendar.MONTH, 1);
+ cal.set(Calendar.DAY_OF_MONTH, 0);
+ return getDate(dateToDateString(cal.getTime(), yyyy_MM_dd_EN));
+ }
+
/**
* ���������������������������������������������������
*
@@ -1450,6 +1482,13 @@
return calendar.getTime();
}
+ //������������
+ public static Date addYears(Date date, int years) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.add(Calendar.YEAR, years);
+ return calendar.getTime();
+ }
/**
* <p>
--
Gitblit v1.8.0