hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-25 00:15:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!934 增加公海客户分析(mapper模拟数据)

Browse Source 
Merge pull request !934 from dhb52/develop
This commit is contained in:
芋道源码
2024-04-07 12:39:38 +00:00
committed by Gitee
parent 6fa3ea8514 84140c52b0
commit 60ac63416a
10 changed files with 310 additions and 50 deletions
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;
case DateIntervalEnum.QUARTER:
while (startTime.isBefore(endTime)) {
LocalDateTime quarterEnd = startTime.withMonth(getQuarterOfYear(startTime) * 3 + 1)
.withDayOfMonth(1).minusNanos(1);
int quarterOfYear = getQuarterOfYear(startTime);
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});
startTime = quarterEnd.plusNanos(1);
}