From 7e01b349c769045abeeeb6cf98241c8d60d0aeb3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 19 六月 2024 09:24:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/core/utils/DateUtil.java | 75 -------------------------------------
1 files changed, 0 insertions(+), 75 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 0c8a385..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
@@ -3151,81 +3151,6 @@
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"));
-
-// System.out.println( DateUtil.daysBetweenDates(DateUtil.stringToDate("2024-02-29","yyyy-MM-dd"),
-// DateUtil.stringToDate("2024-02-01","yyyy-MM-dd"))
-// );
-//
-// System.out.println(DateUtil.calculateBetween(DateUtil.StringToDate("2024-02-29 23:59:59"),DateUtil.StringToDate("2024-02-01 00:00:00"),0));
-
-
-// System.out.println(
-// DateUtil.DateToStr(
-//
-// DateUtil.getMontageDate(DateUtil.StringToDate("2024-02-29 21:59:59"),1) ,"yyyy-MM-dd HH:mm:ss"
-// )
-// );
-//
-//
-//
-// System.out.println(
-//
-// DateUtil.DateToStr(
-//
-// DateUtil.getMontageDate(DateUtil.StringToDate("2024-02-29 21:59:59"),2) ,"yyyy-MM-dd HH:mm:ss"
-// )
-//
-// );
-//
-// System.out.println(
-//
-// DateUtil.DateToStr(
-//
-// DateUtil.getMontageDate(DateUtil.StringToDate("2024-02-29 21:59:59"),3) ,"yyyy-MM-dd HH:mm:ss"
-// )
-
-// );
-
-// System.out.println(
-// new BigDecimal(16).divide(new BigDecimal(15.5),0, RoundingMode.CEILING)
-// );
- LocalDate startDate = DateUtil.StringToDate("2021-02-28 23:59:59").toInstant()
- .atZone(ZoneId.systemDefault())
- .toLocalDate();
- LocalDate endDate = DateUtil.StringToDate("2022-04-05 23:59:59").toInstant()
- .atZone(ZoneId.systemDefault())
- .toLocalDate();
-// LocalDate startDate= LocalDate.of(2021,2,28);
-// LocalDate endDate =LocalDate.of(2022,4,5);
- Period period = Period.between(startDate,endDate);
- int months = period.getYears()* 12 + period.getMonths();
- System.out.println("Months between the two dates: " + months);
-
-
-/* Calendar calo = Calendar.getInstance();
- Calendar caln = Calendar.getInstance(); // ,"yyyy-MM-dd HH:mm:ss"
- caln.setTime(DateUtil.StringToDate("2024-03-06 23:59:59"));
- calo.setTime(DateUtil.StringToDate("2024-02-05 00:00:00"));
- System.out.println( DateUtil.calculateMonthsBetweenDates(calo,caln));*/
-
-// System.out.println(
-// DateUtil.DateToStr(
-// DateUtil.getNextMonthFirst(new Date())
-// ,"yyyy-MM-dd HH:mm:ss")
-//
-// );
-// System.out.println(
-// DateUtil.DateToStr(
-// DateUtil.getNextMonthFirst(
-// DateUtil.StringToDate("2024-12-29 21:59:59")
-// )
-// ,"yyyy-MM-dd HH:mm:ss")
-//
-// );
-
}
/**
--
Gitblit v1.9.3