hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-02-13 00:54:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: LocalDateTimeUtils.getDateRangeList计算季度区间有误

Browse Source
This commit is contained in:
dhb52 2024-04-06 15:14:20 +08:00
parent 44c22e1ef5
commit 84140c52b0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
View File

@ -249,8 +249,11 @@ public class LocalDateTimeUtils {
break; break;
case DateIntervalEnum.QUARTER: case DateIntervalEnum.QUARTER:
while (startTime.isBefore(endTime)) { while (startTime.isBefore(endTime)) {
LocalDateTime quarterEnd = startTime.withMonth(getQuarterOfYear(startTime) * 3 + 1) int quarterOfYear = getQuarterOfYear(startTime);
.withDayOfMonth(1).minusNanos(1); LocalDateTime quarterEnd =
quarterOfYear == 4
? startTime.with(TemporalAdjusters.lastDayOfYear()).plusDays(1).minusNanos(1)
: startTime.withMonth(quarterOfYear * 3 + 1).withDayOfMonth(1).minusNanos(1);
timeRanges.add(new LocalDateTime[]{startTime, quarterEnd}); timeRanges.add(new LocalDateTime[]{startTime, quarterEnd});
startTime = quarterEnd.plusNanos(1); startTime = quarterEnd.plusNanos(1);
} }