From 3e260b9fcb34dd8f2449753e52269509f16e95b6 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 16 Feb 2026 21:01:33 +0800 Subject: [PATCH] refactor(mes): 精简假期设置模块,优化接口和字段定义 --- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayService.java | 15 ++++++++++++--- yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayServiceImpl.java | 6 ++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayService.java index cd86158..3c09477 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayService.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayService.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo.MesCalHoliday import cn.iocoder.yudao.module.mes.dal.dataobject.cal.holiday.MesCalHolidayDO; import jakarta.validation.Valid; +import java.time.LocalDateTime; import java.util.List; /** @@ -14,12 +15,12 @@ import java.util.List; public interface MesCalHolidayService { /** - * 创建假期设置(含 upsert 逻辑:如果该日期已存在记录,则更新) + * 保存假期设置(含 upsert 逻辑:如果该日期已存在记录,则更新) * - * @param createReqVO 创建信息 + * @param saveReqVO 保存信息 * @return 编号 */ - Long createHoliday(@Valid MesCalHolidaySaveReqVO createReqVO); + Long saveHoliday(@Valid MesCalHolidaySaveReqVO saveReqVO); /** * 获得所有假期设置列表(用于日历显示,不分页) @@ -28,4 +29,12 @@ public interface MesCalHolidayService { */ List getHolidayList(); + /** + * 根据日期获得假期设置 + * + * @param day 日期 + * @return 假期设置,不存在则返回 null + */ + MesCalHolidayDO getHolidayByDay(LocalDateTime day); + } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayServiceImpl.java index 577a20f..3a319b5 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/holiday/MesCalHolidayServiceImpl.java @@ -8,6 +8,7 @@ import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; +import java.time.LocalDateTime; import java.util.List; /** @@ -44,4 +45,9 @@ public class MesCalHolidayServiceImpl implements MesCalHolidayService { return holidayMapper.selectList(); } + @Override + public MesCalHolidayDO getHolidayByDay(LocalDateTime day) { + return holidayMapper.selectByDay(day); + } + } -- libgit2 0.21.4