From 2291fba3ed16336860050a4a18c6860cb2396b1b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 27 二月 2024 17:04:43 +0800
Subject: [PATCH] 优化代码
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
index 805fb4a..b2ae91d 100755
--- a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -407,15 +407,24 @@
public static Date getNextMonthFirstDate(String curDate) {
Date date = DateUtil.getDateFromStringB(curDate);
+ return getNextMonthFirstDate(date);
+ }
+
+ public static Date getNextMonthFirstDate(Date curDate) {
+
+ return getNextMonthFirstDate(curDate,1);
+ }
+
+ public static Date getNextMonthFirstDate(Date curDate,int monthCount) {
+
Calendar curDateCal = Calendar.getInstance();
- curDateCal.setTime(date);
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.DAY_OF_MONTH, 1);
- calendar.set(Calendar.HOUR_OF_DAY, 0);
- calendar.set(Calendar.MINUTE, 0);
- calendar.set(Calendar.SECOND, 0);
- calendar.add(Calendar.MONTH, 1);
- return calendar.getTime();
+ curDateCal.setTime(curDate);
+ curDateCal.set(Calendar.DAY_OF_MONTH, 1);
+ curDateCal.set(Calendar.HOUR_OF_DAY, 0);
+ curDateCal.set(Calendar.MINUTE, 0);
+ curDateCal.set(Calendar.SECOND, 0);
+ curDateCal.add(Calendar.MONTH, monthCount);
+ return curDateCal.getTime();
}
public static Date getFirstDate() {
@@ -808,17 +817,22 @@
return calendar.getTime();
}
- public static boolean sameMonthDay(Date startDate,Date endDate){
+ public static boolean sameMonthDay(Date startDate, Date endDate) {
Calendar startCalendar = Calendar.getInstance();
startCalendar.setTime(startDate);
Calendar endCalender = Calendar.getInstance();
endCalender.setTime(endDate);
- if(startCalendar.get(Calendar.DAY_OF_MONTH) == endCalender.get(Calendar.DAY_OF_MONTH)){
+ if (
+ startCalendar.get(Calendar.DAY_OF_MONTH) == endCalender.get(Calendar.DAY_OF_MONTH)
+ && startCalendar.get(Calendar.HOUR_OF_DAY) == endCalender.get(Calendar.HOUR_OF_DAY)
+ ) {
return true;
}
return false;
}
+
+
/**
* 璁＄畻 fromDate 2023-01-12 toDate 2023-09-15
@@ -843,6 +857,8 @@
Calendar fromDateCal = Calendar.getInstance();
fromDateCal.setTime(fromDate);
fromDateCal.set(Calendar.DAY_OF_MONTH, 1);
+ fromDateCal.set(Calendar.HOUR_OF_DAY,0);
+ fromDateCal.set(Calendar.MINUTE,0);
if (fromDate.getTime() > fromDateCal.getTime().getTime()) {
fromDateCal.add(Calendar.MONTH, 1);
firstDay = false;
@@ -853,6 +869,9 @@
Calendar toDateCal = Calendar.getInstance();
toDateCal.setTime(toDate);
toDateCal.set(Calendar.DAY_OF_MONTH, 1);
+ toDateCal.set(Calendar.HOUR_OF_DAY,0);
+ toDateCal.set(Calendar.MINUTE,0);
+
if (toDate.getTime() > toDateCal.getTime().getTime()) {
toDateFirstDate = toDateCal.getTime();
}
--
Gitblit v1.8.0