From 224cd3ff175864f6f8ac4bd24468809e73e4115f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 15 Aug 2023 09:22:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into cjl-230812
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 16 ++++++++++++++++
1 files changed, 16 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 2de5766..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;
+ }
+ }
/**
* ������������������������������������������������������
*
@@ -1064,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));
+ }
+
/**
* ���������������������������������������������������
*
--
Gitblit v1.8.0