diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/MesCalHolidayController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/MesCalHolidayController.java index 8db7a30..c82c705 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/MesCalHolidayController.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/MesCalHolidayController.java @@ -1,12 +1,7 @@ package cn.iocoder.yudao.module.mes.controller.admin.cal.holiday; -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo.MesCalHolidayPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo.MesCalHolidayRespVO; import cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo.MesCalHolidaySaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.cal.holiday.MesCalHolidayDO; @@ -15,16 +10,17 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.io.IOException; +import java.time.LocalDateTime; import java.util.List; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - MES 假期设置") @@ -36,50 +32,23 @@ public class MesCalHolidayController { @Resource private MesCalHolidayService holidayService; - // TODO @AI：是不是只有 save，没有 update 和 delete，以及 create？ - - @PostMapping("/create") - @Operation(summary = "创建假期设置", description = "如果该日期已存在记录，则更新") + @PostMapping("/save") + @Operation(summary = "保存假期设置", description = "如果该日期已存在记录，则更新") @PreAuthorize("@ss.hasPermission('mes:cal-holiday:create')") - public CommonResult createHoliday(@Valid @RequestBody MesCalHolidaySaveReqVO createReqVO) { - return success(holidayService.createHoliday(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新假期设置") - @PreAuthorize("@ss.hasPermission('mes:cal-holiday:update')") - public CommonResult updateHoliday(@Valid @RequestBody MesCalHolidaySaveReqVO updateReqVO) { - holidayService.updateHoliday(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除假期设置") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:cal-holiday:delete')") - public CommonResult deleteHoliday(@RequestParam("id") Long id) { - holidayService.deleteHoliday(id); - return success(true); + public CommonResult saveHoliday(@Valid @RequestBody MesCalHolidaySaveReqVO saveReqVO) { + return success(holidayService.saveHoliday(saveReqVO)); } - @GetMapping("/get") - @Operation(summary = "获得假期设置") - @Parameter(name = "id", description = "编号", required = true, example = "1024") + @GetMapping("/get-by-day") + @Operation(summary = "根据日期获得假期设置") + @Parameter(name = "day", description = "日期", required = true) @PreAuthorize("@ss.hasPermission('mes:cal-holiday:query')") - public CommonResult getHoliday(@RequestParam("id") Long id) { - MesCalHolidayDO holiday = holidayService.getHoliday(id); + public CommonResult getHolidayByDay( + @RequestParam("day") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) LocalDateTime day) { + MesCalHolidayDO holiday = holidayService.getHolidayByDay(day); return success(BeanUtils.toBean(holiday, MesCalHolidayRespVO.class)); } - // TODO @AI：对齐下，/Users/yunai/Java/ktg-mes 界面（不是后端），是否需要该接口。 - @GetMapping("/page") - @Operation(summary = "获得假期设置分页") - @PreAuthorize("@ss.hasPermission('mes:cal-holiday:query')") - public CommonResult> getHolidayPage(@Valid MesCalHolidayPageReqVO pageReqVO) { - PageResult pageResult = holidayService.getHolidayPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MesCalHolidayRespVO.class)); - } - @GetMapping("/list") @Operation(summary = "获得所有假期设置列表", description = "日历组件使用，返回全量数据") @PreAuthorize("@ss.hasPermission('mes:cal-holiday:query')") @@ -88,18 +57,4 @@ public class MesCalHolidayController { return success(BeanUtils.toBean(list, MesCalHolidayRespVO.class)); } - // TODO @AI：对齐下，/Users/yunai/Java/ktg-mes 界面（不是后端），是否需要该接口。 - @GetMapping("/export-excel") - @Operation(summary = "导出假期设置 Excel") - @PreAuthorize("@ss.hasPermission('mes:cal-holiday:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportHolidayExcel(@Valid MesCalHolidayPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = holidayService.getHolidayPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "假期设置.xls", "数据", MesCalHolidayRespVO.class, - BeanUtils.toBean(list, MesCalHolidayRespVO.class)); - } - } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidayPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidayPageReqVO.java deleted file mode 100644 index cdd7b90..0000000 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidayPageReqVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo; - -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - MES 假期设置分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MesCalHolidayPageReqVO extends PageParam { - - @Schema(description = "日期类型", example = "HOLIDAY") - private String type; - - @Schema(description = "日期（起）") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime theDayStart; - - @Schema(description = "日期（止）") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime theDayEnd; - -} diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidayRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidayRespVO.java index 72fc69a..869320e 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidayRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidayRespVO.java @@ -1,10 +1,5 @@ package cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; -import cn.iocoder.yudao.module.mes.enums.DictTypeConstants; -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; -import cn.idev.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -12,36 +7,15 @@ import java.time.LocalDateTime; @Schema(description = "管理后台 - MES 假期设置 Response VO") @Data -@ExcelIgnoreUnannotated public class MesCalHolidayRespVO { - @Schema(description = "编号") - @ExcelProperty("编号") - private Long id; - @Schema(description = "日期") - @ExcelProperty("日期") - private LocalDateTime theDay; + private LocalDateTime day; @Schema(description = "日期类型") - @ExcelProperty(value = "日期类型", converter = DictConvert.class) - @DictFormat(DictTypeConstants.MES_CAL_HOLIDAY_TYPE) - private String type; - - @Schema(description = "开始时间") - @ExcelProperty("开始时间") - private LocalDateTime startTime; - - @Schema(description = "结束时间") - @ExcelProperty("结束时间") - private LocalDateTime endTime; + private Integer type; @Schema(description = "备注") - @ExcelProperty("备注") private String remark; - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidaySaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidaySaveReqVO.java index 35830f4..74560c7 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidaySaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/cal/holiday/vo/MesCalHolidaySaveReqVO.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.Data; import java.time.LocalDateTime; -// TODO @AI:ktg 里，支持按照范围添加么？/cal/holiday 界面 @Schema(description = "管理后台 - MES 假期设置新增/修改 Request VO") @Data public class MesCalHolidaySaveReqVO { @@ -17,17 +15,11 @@ public class MesCalHolidaySaveReqVO { @Schema(description = "日期", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "日期不能为空") - private LocalDateTime theDay; + private LocalDateTime day; - @Schema(description = "日期类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "HOLIDAY") - @NotEmpty(message = "日期类型不能为空") - private String type; - - @Schema(description = "开始时间") - private LocalDateTime startTime; - - @Schema(description = "结束时间") - private LocalDateTime endTime; + @Schema(description = "日期类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotNull(message = "日期类型不能为空") + private Integer type; @Schema(description = "备注") private String remark; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/holiday/MesCalHolidayDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/holiday/MesCalHolidayDO.java index e58ac8f..f305208 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/holiday/MesCalHolidayDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/cal/holiday/MesCalHolidayDO.java @@ -31,21 +31,13 @@ public class MesCalHolidayDO extends BaseDO { /** * 日期 */ - private LocalDateTime theDay; + private LocalDateTime day; /** * 日期类型 * * 字典 {@link cn.iocoder.yudao.module.mes.enums.DictTypeConstants#MES_CAL_HOLIDAY_TYPE} */ - private String type; - /** - * 开始时间 - */ - private LocalDateTime startTime; - /** - * 结束时间 - */ - private LocalDateTime endTime; + private Integer type; /** * 备注 */ diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/holiday/MesCalHolidayMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/holiday/MesCalHolidayMapper.java index 43f67a9..7058188 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/holiday/MesCalHolidayMapper.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/cal/holiday/MesCalHolidayMapper.java @@ -1,9 +1,7 @@ package cn.iocoder.yudao.module.mes.dal.mysql.cal.holiday; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo.MesCalHolidayPageReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.cal.holiday.MesCalHolidayDO; import org.apache.ibatis.annotations.Mapper; @@ -18,21 +16,13 @@ import java.util.List; @Mapper public interface MesCalHolidayMapper extends BaseMapperX { - default PageResult selectPage(MesCalHolidayPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MesCalHolidayDO::getType, reqVO.getType()) - .geIfPresent(MesCalHolidayDO::getTheDay, reqVO.getTheDayStart()) - .leIfPresent(MesCalHolidayDO::getTheDay, reqVO.getTheDayEnd()) - .orderByAsc(MesCalHolidayDO::getTheDay)); - } - - default MesCalHolidayDO selectByTheDay(LocalDateTime theDay) { - return selectOne(MesCalHolidayDO::getTheDay, theDay); + default MesCalHolidayDO selectByDay(LocalDateTime day) { + return selectOne(MesCalHolidayDO::getDay, day); } default List selectList() { return selectList(new LambdaQueryWrapperX() - .orderByAsc(MesCalHolidayDO::getTheDay)); + .orderByAsc(MesCalHolidayDO::getDay)); } } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java index d831ed4..c5e0e39 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/DictTypeConstants.java @@ -10,5 +10,7 @@ public interface DictTypeConstants { String MES_CLIENT_TYPE = "mes_client_type"; // MES 客户类型 String MES_VENDOR_LEVEL = "mes_vendor_level"; // MES 供应商级别 String MES_CAL_HOLIDAY_TYPE = "mes_cal_holiday_type"; // MES 假期类型 + String MES_TM_TOOL_STATUS = "mes_tm_tool_status"; // MES 工具状态 + String MES_TM_MAINTEN_TYPE = "mes_tm_mainten_type"; // MES 保养维护类型 } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java index 4c2bdac..0d00c9c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java @@ -107,9 +107,13 @@ public interface ErrorCodeConstants { // ========== MES 工具管理-工具类型（1-040-400-000） ========== ErrorCode TM_TOOL_TYPE_NOT_EXISTS = new ErrorCode(1_040_400_000, "工具类型不存在"); + ErrorCode TM_TOOL_TYPE_CODE_DUPLICATE = new ErrorCode(1_040_400_001, "工具类型编码已存在"); + ErrorCode TM_TOOL_TYPE_NAME_DUPLICATE = new ErrorCode(1_040_400_002, "工具类型名称已存在"); + ErrorCode TM_TOOL_TYPE_HAS_TOOL = new ErrorCode(1_040_400_003, "该工具类型下存在工具，无法删除"); // ========== MES 工具管理-工具台账（1-040-401-000） ========== ErrorCode TM_TOOL_NOT_EXISTS = new ErrorCode(1_040_401_000, "工具不存在"); + ErrorCode TM_TOOL_CODE_DUPLICATE = new ErrorCode(1_040_401_001, "工具编码已存在"); // ========== MES 生产管理-工序（1-040-500-000） ========== ErrorCode PRO_PROCESS_NOT_EXISTS = new ErrorCode(1_040_500_000, "工序不存在"); 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 287d4d2..cd86158 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 @@ -1,7 +1,5 @@ package cn.iocoder.yudao.module.mes.service.cal.holiday; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo.MesCalHolidayPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo.MesCalHolidaySaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.cal.holiday.MesCalHolidayDO; import jakarta.validation.Valid; @@ -24,36 +22,6 @@ public interface MesCalHolidayService { Long createHoliday(@Valid MesCalHolidaySaveReqVO createReqVO); /** - * 更新假期设置 - * - * @param updateReqVO 更新信息 - */ - void updateHoliday(@Valid MesCalHolidaySaveReqVO updateReqVO); - - /** - * 删除假期设置 - * - * @param id 编号 - */ - void deleteHoliday(Long id); - - /** - * 获得假期设置 - * - * @param id 编号 - * @return 假期设置 - */ - MesCalHolidayDO getHoliday(Long id); - - /** - * 获得假期设置分页 - * - * @param pageReqVO 分页查询 - * @return 假期设置分页 - */ - PageResult getHolidayPage(MesCalHolidayPageReqVO pageReqVO); - - /** * 获得所有假期设置列表（用于日历显示，不分页） * * @return 假期设置列表 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 8d23f77..577a20f 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 @@ -1,8 +1,6 @@ package cn.iocoder.yudao.module.mes.service.cal.holiday; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo.MesCalHolidayPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.cal.holiday.vo.MesCalHolidaySaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.cal.holiday.MesCalHolidayDO; import cn.iocoder.yudao.module.mes.dal.mysql.cal.holiday.MesCalHolidayMapper; @@ -12,9 +10,6 @@ import org.springframework.validation.annotation.Validated; import java.util.List; -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.CAL_HOLIDAY_NOT_EXISTS; - /** * MES 假期设置 Service 实现类 * @@ -28,55 +23,23 @@ public class MesCalHolidayServiceImpl implements MesCalHolidayService { private MesCalHolidayMapper holidayMapper; @Override - public Long createHoliday(MesCalHolidaySaveReqVO createReqVO) { + public Long saveHoliday(MesCalHolidaySaveReqVO saveReqVO) { // Upsert 逻辑：如果该日期已有记录，则更新 - MesCalHolidayDO existing = holidayMapper.selectByTheDay(createReqVO.getTheDay()); + MesCalHolidayDO existing = holidayMapper.selectByDay(saveReqVO.getDay()); if (existing != null) { - MesCalHolidayDO updateObj = BeanUtils.toBean(createReqVO, MesCalHolidayDO.class); + MesCalHolidayDO updateObj = BeanUtils.toBean(saveReqVO, MesCalHolidayDO.class); updateObj.setId(existing.getId()); holidayMapper.updateById(updateObj); return existing.getId(); } + // 插入新记录 - MesCalHolidayDO holiday = BeanUtils.toBean(createReqVO, MesCalHolidayDO.class); + MesCalHolidayDO holiday = BeanUtils.toBean(saveReqVO, MesCalHolidayDO.class); holidayMapper.insert(holiday); return holiday.getId(); } @Override - public void updateHoliday(MesCalHolidaySaveReqVO updateReqVO) { - // 校验存在 - validateHolidayExists(updateReqVO.getId()); - // 更新 - MesCalHolidayDO updateObj = BeanUtils.toBean(updateReqVO, MesCalHolidayDO.class); - holidayMapper.updateById(updateObj); - } - - @Override - public void deleteHoliday(Long id) { - // 校验存在 - validateHolidayExists(id); - // 删除 - holidayMapper.deleteById(id); - } - - private void validateHolidayExists(Long id) { - if (holidayMapper.selectById(id) == null) { - throw exception(CAL_HOLIDAY_NOT_EXISTS); - } - } - - @Override - public MesCalHolidayDO getHoliday(Long id) { - return holidayMapper.selectById(id); - } - - @Override - public PageResult getHolidayPage(MesCalHolidayPageReqVO pageReqVO) { - return holidayMapper.selectPage(pageReqVO); - } - - @Override public List getHolidayList() { return holidayMapper.selectList(); }