From c462126d2eaf08e95c7bbb7f5db0a1a826356a75 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 28 十一月 2024 15:08:13 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/system_service/src/main/java/com/doumee/core/utils/DateCompare.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateCompare.java b/server/system_service/src/main/java/com/doumee/core/utils/DateCompare.java
index 1335d95..1164e74 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateCompare.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateCompare.java
@@ -67,14 +67,23 @@
BigDecimal monthFloat = new BigDecimal(month) ;
int yearDays = day - DateUtil.daysBetweenDates(DateUtil.addYearToDate(fromDate,year),fromDate) ;
- if(yearDays>0){
+ if(yearDays!=0){
yearFloat = yearFloat.add(new BigDecimal(yearDays).divide(new BigDecimal(365), 2,RoundingMode.FLOOR));
}
int monthDays = day - DateUtil.daysBetweenDates(DateUtil.addMonthToDate(fromDate,month),fromDate) ;
- if(monthDays>0){
- monthFloat = monthFloat.add(new BigDecimal(monthDays).divide(new BigDecimal(30), 2,RoundingMode.FLOOR));
+ if(monthDays!=0){
+ monthFloat = monthFloat.add(new BigDecimal(monthDays*12).divide(new BigDecimal(365), 2,RoundingMode.FLOOR));
}
return DateCompare.builder().day(day).month(month).year(year).yearFloat(yearFloat).monthFloat(monthFloat).yearDays(yearDays).monthDays(monthDays).build();
+ }
+
+ public static void main(String[] args) {
+ DateCompare dateCompare = DateCompare.dayCompare(DateUtil.getDateFromString("2024-12-01 00:00:00"),DateUtil.getDateByString("2025-03-01 00:00:00")
+ ,DateUtil.getDateFromString("2024-12-01 00:00:00"),DateUtil.getDateFromString("2024-12-03 00:00:00"));
+ System.out.println(dateCompare.monthFloat);
+ System.out.println(dateCompare.yearFloat);
+ System.out.println(dateCompare.yearFloat);
+ System.out.println(dateCompare.yearFloat);
}
public static DateCompare monthYearCompare(Date fromDate,Date toDate ){
//寮�濮嬫椂闂村線鍚庡欢浼革紝闄ゅ幓鏈夋晥鏃舵湡
@@ -96,12 +105,12 @@
BigDecimal monthFloat = new BigDecimal(month) ;
int yearDays = day - DateUtil.daysBetweenDates(DateUtil.addYearToDate(fromDate,year),fromDate) ;
- if(yearDays>0){
+ if(yearDays!=0){
yearFloat = yearFloat.add(new BigDecimal(yearDays).divide(new BigDecimal(365), 2,RoundingMode.FLOOR));
}
int monthDays = day - DateUtil.daysBetweenDates(DateUtil.addMonthToDate(fromDate,month),fromDate) ;
- if(monthDays>0){
- monthFloat = monthFloat.add(new BigDecimal(monthDays).divide(new BigDecimal(30), 2,RoundingMode.FLOOR));
+ if(monthDays!=0){
+ monthFloat = monthFloat.add(new BigDecimal(monthDays*12).divide(new BigDecimal(365), 2,RoundingMode.FLOOR));
}
return DateCompare.builder().day(day).month(month).year(year).yearFloat(yearFloat).monthFloat(monthFloat).yearDays(yearDays).monthDays(monthDays).build();
}
--
Gitblit v1.9.3