From 8ad75d5872872b79abada58589adad0df4614db6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 07 十月 2026 11:59:44 +0800
Subject: [PATCH] fix(holiday): 走势图按年度配置截取假期天数
---
traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayConfigService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayConfigService.java b/traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayConfigService.java
index 6b281c7..455faca 100644
--- a/traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayConfigService.java
+++ b/traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayConfigService.java
@@ -39,7 +39,16 @@
return holidayCalendarMapper.selectList(new LambdaQueryWrapper<HolidayCalendar>()
.eq(HolidayCalendar::getYear, year)
.eq(HolidayCalendar::getHolidayType, holidayType)
+ .ge(HolidayCalendar::getDayIndex, 1)
.orderByAsc(HolidayCalendar::getDayIndex));
+ }
+
+ public HolidayCalendar findPreviousDay(int year, String holidayType) {
+ return holidayCalendarMapper.selectOne(new LambdaQueryWrapper<HolidayCalendar>()
+ .eq(HolidayCalendar::getYear, year)
+ .eq(HolidayCalendar::getHolidayType, holidayType)
+ .eq(HolidayCalendar::getDayIndex, 0)
+ .last("limit 1"));
}
public HolidayCalendar findHolidayByDate(LocalDate date) {
@@ -65,8 +74,8 @@
if (holidayDate == null || holidayDate.getYear() != year) {
throw new IllegalArgumentException("鏃ユ湡蹇呴』灞炰簬鎵�閫夊勾浠�");
}
- if (dayIndex == null || dayIndex < 1) {
- throw new IllegalArgumentException("绗嚑鏃ュ繀椤讳粠 1 寮�濮�");
+ if (dayIndex == null || dayIndex < 0) {
+ throw new IllegalArgumentException("鏃ユ湡搴忓彿涓嶈兘灏忎簬 0");
}
LambdaQueryWrapper<HolidayCalendar> duplicate = new LambdaQueryWrapper<HolidayCalendar>()
.eq(HolidayCalendar::getYear, year)
--
Gitblit v1.9.1