From 58494fbf65b149bfc9cdbef1661c6bb1432bb369 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 10 一月 2023 19:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/hx/util/DateUtil.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java
index 18bc8ff..a52169c 100644
--- a/src/main/java/com/hx/util/DateUtil.java
+++ b/src/main/java/com/hx/util/DateUtil.java
@@ -609,7 +609,7 @@
public static Date getYearStart(Date time) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(time);
- calendar.set(Calendar.MONTH, 1);
+ calendar.set(Calendar.MONTH, 0);
calendar.set(Calendar.DAY_OF_MONTH, 1);
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.set(Calendar.MINUTE, 0);
@@ -625,7 +625,7 @@
public static Date getYearEnd(Date time) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(time);
- calendar.set(Calendar.MONTH, 12);
+ 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);
@@ -658,6 +658,18 @@
calendar.set(Calendar.SECOND, 59);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
return sdf.format(calendar.getTime());
+ }
+
+ /**杩欏ぉ鐨勫紑濮嬫椂闂�
+ * 鏃ユ湡2000-01-01鍙�2000-01-01 00:00:00
+ */
+ public static Date dayToStartDate(Date date) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ return calendar.getTime();
}
/**杩欏ぉ鐨勬渶鍚庢椂闂�
@@ -743,4 +755,29 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
return sdf.format(calendar.getTime());
}
+
+ /**
+ * 鑾峰彇鏃堕棿褰撴湀鍓╀綑澶╂暟
+ * */
+ public static Integer getMonthSurplus(Date date) {
+ Calendar month = Calendar.getInstance();
+ month.setTime(new Date());
+ month.set(Calendar.DATE, 1);
+ month.roll(Calendar.DATE, -1);
+ return month.getActualMaximum(Calendar.DATE) - Calendar.getInstance().get(Calendar.DAY_OF_MONTH);
+ }
+
+ /**鑾峰彇褰撳墠鏃堕棿鎵�鍦ㄥ懆鐨勫懆涓�00:00:00*/
+ public static Date getMonday(Date date) {
+ Calendar calendar = Calendar.getInstance(Locale.CHINA);
+ calendar.setTime(date);
+ //浠ュ懆涓�涓洪鏃�
+ calendar.setFirstDayOfWeek(Calendar.MONDAY);
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ //鍛ㄤ竴
+ calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+ return calendar.getTime();
+ }
}
--
Gitblit v1.8.0