yudao-team/oa-master
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更改常规假期,可以获取到当前年数
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
Details
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
XaoLi717 2024-12-04 16:34:45 +08:00
parent dc7f3e1190
commit 100022251e
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/calendar/CalendarServiceImpl.java
View File

@ -31,23 +31,24 @@ public class CalendarServiceImpl implements CalendarService {
@Resource
private CalendarMapper calendarMapper;
private static final int YEAR = LocalDate.now().getYear();
// 假期日期，改用 LocalDate 存储
private static final Set<LocalDate> HOLIDAYS;
static {
Set<LocalDate> holidays = new HashSet<>();
holidays.add(LocalDate.of(2024, 1, 1)); // 元旦
holidays.add(LocalDate.of(2024, 5, 1)); // 劳动节
holidays.add(LocalDate.of(2024, 5, 2));
holidays.add(LocalDate.of(2024, 5, 3));
holidays.add(LocalDate.of(2024, 5, 4));
holidays.add(LocalDate.of(2024, 5, 5));
holidays.add(LocalDate.of(2024, 10, 1)); // 国庆节
holidays.add(LocalDate.of(2024, 10, 2));
holidays.add(LocalDate.of(2024, 10, 3));
holidays.add(LocalDate.of(2024, 10, 4));
holidays.add(LocalDate.of(2024, 10, 5));
holidays.add(LocalDate.of(2024, 10, 6));
holidays.add(LocalDate.of(2024, 10, 7));
holidays.add(LocalDate.of(YEAR, 1, 1)); // 元旦
holidays.add(LocalDate.of(YEAR, 5, 1)); // 劳动节
holidays.add(LocalDate.of(YEAR, 5, 2));
holidays.add(LocalDate.of(YEAR, 5, 3));
holidays.add(LocalDate.of(YEAR, 5, 4));
holidays.add(LocalDate.of(YEAR, 5, 5));
holidays.add(LocalDate.of(YEAR, 10, 1)); // 国庆节
holidays.add(LocalDate.of(YEAR, 10, 2));
holidays.add(LocalDate.of(YEAR, 10, 3));
holidays.add(LocalDate.of(YEAR, 10, 4));
holidays.add(LocalDate.of(YEAR, 10, 5));
holidays.add(LocalDate.of(YEAR, 10, 6));
holidays.add(LocalDate.of(YEAR, 10, 7));
// 将 Set 转为不可变集合
HOLIDAYS = Collections.unmodifiableSet(holidays);