From ead15e55da06facacc8afd72f63846ebdbd8ea43 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:01:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/calendar/vo/CalendarPageReqVO.java | 5 ++++- .../controller/admin/calendar/vo/CalendarRespVO.java | 9 ++++++++- .../controller/admin/calendar/vo/CalendarSaveReqVO.java | 5 ++++- .../module/home/dal/dataobject/calendar/CalendarDO.java | 6 +++++- .../module/home/dal/mysql/calendar/CalendarMapper.java | 3 ++- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarPageReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarPageReqVO.java index fffa4e9..ac1b7cd 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarPageReqVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarPageReqVO.java @@ -25,8 +25,11 @@ public class CalendarPageReqVO extends PageParam { @Schema(description = "是否是节假日") private Integer isWorkday; + @Schema(description = "日期内容") + private Integer content; + @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; -} \ No newline at end of file +} diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarRespVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarRespVO.java index 4cf64e1..8d597d0 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarRespVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarRespVO.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.home.controller.admin.calendar.vo; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -24,8 +26,13 @@ public class CalendarRespVO { @ExcelProperty("是否是节假日") private Integer isWorkday; + @Schema(description = "日期内容", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty(value = "日期内容", converter = DictConvert.class) + @DictFormat("calendar_content") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 + private Integer content; + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; -} \ No newline at end of file +} diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarSaveReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarSaveReqVO.java index ba88a2a..69684f8 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarSaveReqVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarSaveReqVO.java @@ -20,4 +20,7 @@ public class CalendarSaveReqVO { @NotNull(message = "是否是节假日不能为空") private Integer isWorkday; -} \ No newline at end of file + @Schema(description = "日期内容", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer content; + +} diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/calendar/CalendarDO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/calendar/CalendarDO.java index 077d42e..acd3212 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/calendar/CalendarDO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/calendar/CalendarDO.java @@ -31,9 +31,13 @@ public class CalendarDO extends BaseDO { * 字符串日期 */ private String date; + /** + * 日期内容 + */ + private Integer content; /** * 是否是节假日 */ private Integer isWorkday; -} \ No newline at end of file +} diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/calendar/CalendarMapper.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/calendar/CalendarMapper.java index 30c4d2f..458c9e2 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/calendar/CalendarMapper.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/calendar/CalendarMapper.java @@ -22,8 +22,9 @@ public interface CalendarMapper extends BaseMapperX { .eqIfPresent(CalendarDO::getId, reqVO.getId()) .betweenIfPresent(CalendarDO::getDate, reqVO.getDate()) .eqIfPresent(CalendarDO::getIsWorkday, reqVO.getIsWorkday()) + .eqIfPresent(CalendarDO::getContent, reqVO.getContent()) .betweenIfPresent(CalendarDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(CalendarDO::getId)); } -} \ No newline at end of file +}