休假管理模块构建,加增接口:

1、查询当前月的所有休假
2、根据节假日类别查询
3、查询具体日期返回对象
This commit is contained in:
liuzongkun999
2025-02-20 21:20:15 +08:00
parent 15a8480784
commit 6716d289cb
8 changed files with 520 additions and 0 deletions

View File

@@ -0,0 +1,54 @@
package com.ruoyi.oa.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 休假管理对象 sys_oa_holiday
*
* @author liuzongkun999
* @date 2025-02-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_oa_holiday")
public class SysOaHoliday extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键id
*/
@TableId(value = "holiday_id")
private Long holidayId;
/**
* 0正常1周日2节假日3调休
*/
private Integer type;
/**
* 假期日期
*/
private Date holidayTime;
/**
* 假期名称(如果是周日,值为休息日)
*/
private String name;
/**
* 备注
*/
private String remark;
/**
* 删除标志
*/
@TableLogic
private Long delFlag;
}

View File

@@ -0,0 +1,57 @@
package com.ruoyi.oa.domain.bo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.util.Date;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 休假管理业务对象 sys_oa_holiday
*
* @author liuzongkun999
* @date 2025-02-20
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class SysOaHolidayBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long holidayId;
/**
* 0正常1周日2节假日3调休
*/
@NotNull(message = "0正常1周日2节假日3调休不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer type;
/**
* 假期日期
*/
@NotNull(message = "假期日期不能为空", groups = { AddGroup.class, EditGroup.class })
private Date holidayTime;
/**
* 假期名称(如果是周日,值为休息日)
*/
@NotBlank(message = "假期名称(如果是周日,值为休息日)不能为空", groups = { AddGroup.class, EditGroup.class })
private String name;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark;
}

View File

@@ -0,0 +1,58 @@
package com.ruoyi.oa.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
import java.util.Date;
/**
* 休假管理视图对象 sys_oa_holiday
*
* @author liuzongkun999
* @date 2025-02-20
*/
@Data
@ExcelIgnoreUnannotated
public class SysOaHolidayVo {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long holidayId;
/**
* 0正常1周日2节假日3调休
*/
@ExcelProperty(value = "0正常1周日2节假日3调休")
private Integer type;
/**
* 假期日期
*/
@ExcelProperty(value = "假期日期")
private Date holidayTime;
/**
* 假期名称(如果是周日,值为休息日)
*/
@ExcelProperty(value = "假期名称", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "如=果是周日,值为休息日")
private String name;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}