工作日历修改

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;
 
-}
+}

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;
 
-}
+}

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;
 
-}
+    @Schema(description = "日期内容", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Integer content;
+
+}

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;
 
-}
+}

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<CalendarDO> {
                 .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));
     }
 
-}
+}