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-06 15:01:23 +08:00
parent e1e37657f0
commit ead15e55da
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarPageReqVO.java
View File

@ -25,6 +25,9 @@ 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;

7
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarRespVO.java
View File

@ -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,6 +26,11 @@ 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;

3
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/calendar/vo/CalendarSaveReqVO.java
View File

@ -20,4 +20,7 @@ public class CalendarSaveReqVO {
@NotNull(message = "是否是节假日不能为空")
private Integer isWorkday;
@Schema(description = "日期内容", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer content;
}

4
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/calendar/CalendarDO.java
View File

@ -31,6 +31,10 @@ public class CalendarDO extends BaseDO {
* 字符串日期
*/
private String date;
/**
* 日期内容
*/
private Integer content;
/**
* 是否是节假日
*/

1
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/calendar/CalendarMapper.java
View File

@ -22,6 +22,7 @@ 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));
}