From 8e79771fd46206cdb6fb698f5dc78dc41886238f Mon Sep 17 00:00:00 2001
From: cmg <527198563@qq.com>
Date: 星期一, 27 五月 2024 14:29:23 +0800
Subject: [PATCH] Merge branch 'matesr-prod-new' into master-stander
---
src/main/java/com/hx/util/DateUtil.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java
index 4648efa..33b8d66 100644
--- a/src/main/java/com/hx/util/DateUtil.java
+++ b/src/main/java/com/hx/util/DateUtil.java
@@ -573,7 +573,7 @@
/**
* 鑾峰彇褰撳墠鏈堢殑缁撴潫鏃堕棿
* @param date 鐐瑰墠鏃堕棿
- * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59
+ * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59999
*/
public static Date getMonthEnd(Date date) {
Calendar calendar = Calendar.getInstance();
@@ -583,6 +583,21 @@
calendar.set(Calendar.MINUTE, 59);
calendar.set(Calendar.SECOND, 59);
calendar.set(Calendar.MILLISECOND,999);
+ return calendar.getTime();
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鏈堢殑缁撴潫鏃堕棿锛屾病鏈夋绉�
+ * @param date 鐐瑰墠鏃堕棿
+ * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59
+ */
+ public static Date getMonthEndNoMillisecond(Date date) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+ calendar.set(Calendar.HOUR_OF_DAY, 23);
+ calendar.set(Calendar.MINUTE, 59);
+ calendar.set(Calendar.SECOND, 59);
return calendar.getTime();
}
@@ -622,7 +637,7 @@
/**
* 鑾峰彇褰撳墠骞寸殑缁撴潫鏃堕棿
* @param time 鏃堕棿
- * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59
+ * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59999
*/
public static Date getYearEnd(Date time) {
Calendar calendar = Calendar.getInstance();
@@ -633,6 +648,22 @@
calendar.set(Calendar.MINUTE, 59);
calendar.set(Calendar.SECOND, 59);
calendar.set(Calendar.MILLISECOND,999);
+ return calendar.getTime();
+ }
+
+ /**
+ * 鑾峰彇褰撳墠骞寸殑缁撴潫鏃堕棿锛屾病鏈夋绉�
+ * @param time 鏃堕棿
+ * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59
+ */
+ public static Date getYearEndNoMillisecond(Date time) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(time);
+ calendar.set(Calendar.MONTH, 11);
+ calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DATE));
+ calendar.set(Calendar.HOUR_OF_DAY, 23);
+ calendar.set(Calendar.MINUTE, 59);
+ calendar.set(Calendar.SECOND, 59);
return calendar.getTime();
}
@@ -677,7 +708,7 @@
}
/**杩欏ぉ鐨勬渶鍚庢椂闂�
- * 鏃ユ湡2000-01-01鍙�2000-01-01 23:59:59
+ * 鏃ユ湡2000-01-01鍙�2000-01-01 23:59:59999
*/
public static Date dayToEndDate(Date date) {
Calendar calendar = Calendar.getInstance();
@@ -689,6 +720,18 @@
return calendar.getTime();
}
+ /**杩欏ぉ鐨勬渶鍚庢椂闂达紝娌℃湁姣
+ * 鏃ユ湡2000-01-01鍙�2000-01-01 23:59:59
+ */
+ public static Date dayToEndDateNoMillisecond(Date date) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.set(Calendar.HOUR_OF_DAY, 23);
+ calendar.set(Calendar.MINUTE, 59);
+ calendar.set(Calendar.SECOND, 59);
+ return calendar.getTime();
+ }
+
/**鑾峰彇鏈堜唤鐨勫ぉ鏁�
* @param date 鏃堕棿
* @return 鏈堜唤鐨勫ぉ鏁�
--
Gitblit v1.8.0