From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/core/utils/DateUtil.java | 66 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/service/src/main/java/com/doumee/core/utils/DateUtil.java
index 45bdcc0..57536d2 100644
--- a/server/service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -1,11 +1,16 @@
package com.doumee.core.utils;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.DateFormatSymbols;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.ZoneId;
import java.util.Calendar;
import java.util.Date;
import java.util.Enumeration;
@@ -1298,7 +1303,7 @@
calo.setTime(oldDate);
caln.setTime(newDate);
if(type==0||type==1){
- return calculateDaysBetweenDates(caln, calo) ;
+ return calculateDaysBetweenDates(caln, calo) + 1 ;
}else if(type==2){
int day = caln.get(Calendar.DATE);
@@ -2995,6 +3000,21 @@
return calendar.getTime();
}
+ /**
+ * 鑾峰彇鎸囧畾鏃ユ湡鐨勪笅涓湀绗竴澶�
+ * @param date
+ * @return
+ */
+ public static Date getNextMonthFirst(Date date){
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.add(Calendar.MONTH, 1); // 灏嗘棩鍘嗙殑鏈堜唤澧炲姞1
+ calendar.set(Calendar.DAY_OF_MONTH, 1); // 璁剧疆涓轰笅涓湀鐨勭涓�澶�
+ return calendar.getTime();
+ }
+
+
+
public static String afterDateToStr(Integer days){
Date date = new Date();
@@ -3109,12 +3129,50 @@
}
+ /**
+ * 鎷兼帴鏃ユ湡鏁版嵁
+ * @param date
+ * @param optType 1:姣忔棩寮�濮� 2锛氭瘡鏃ョ粨鏉� 3:鏄ㄦ棩缁撴潫
+ * @return
+ */
+ public static Date getMontageDate(Date date ,Integer optType) {
+ String strShortDate = DateUtil.dateToString(date,"yyyy-MM-dd");
+ if(optType.equals(1)){
+ return DateUtil.StringToDate(strShortDate +" 00:00:00");
+ }else if(optType.equals(2)){
+ return DateUtil.StringToDate(strShortDate +" 23:59:59");
+ }else if(optType.equals(3)){
+ strShortDate = DateUtil.dateToString(DateUtil.getDateBetween(date,-1),"yyyy-MM-dd");
+ return DateUtil.StringToDate(strShortDate +" 23:59:59");
+ }else{
+ return null;
+ }
+ }
+
public static void main(String[] args) {
- System.out.println(DateUtil.DateToStr(DateUtil.afterDateByType(
- DateUtil.stringToDate("2024-02-01","yyyy-MM-dd")
- ,1,1),"yyyy-MM-dd HH:mm:ss"));
}
+ /**
+ * 鑾峰彇鐩稿樊鐨勬湀鏁�
+ * @param sDate
+ * @param eDate
+ * @return
+ */
+ public static Integer getDifferenceMonths(Date sDate ,Date eDate) {
+ LocalDate startDate = sDate.toInstant()
+ .atZone(ZoneId.systemDefault())
+ .toLocalDate();
+ LocalDate endDate = eDate.toInstant()
+ .atZone(ZoneId.systemDefault())
+ .toLocalDate();
+// LocalDate startDate= LocalDate.of(2021,2,28);
+// LocalDate endDate =LocalDate.of(2022,4,5);
+ Period period = Period.between(endDate,startDate);
+ int months = period.getYears()* 12 + period.getMonths();
+ return months + 1;
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3