diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaHolidayController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaHolidayController.java
new file mode 100644
index 0000000..90bdbb3
--- /dev/null
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaHolidayController.java
@@ -0,0 +1,137 @@
+package com.ruoyi.oa.controller;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.oa.domain.vo.SysOaHolidayVo;
+import com.ruoyi.oa.domain.bo.SysOaHolidayBo;
+import com.ruoyi.oa.service.ISysOaHolidayService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 休假管理
+ *
+ * @author liuzongkun999
+ * @date 2025-02-20
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/oa/oaHoliday")
+public class SysOaHolidayController extends BaseController {
+
+    private final ISysOaHolidayService iSysOaHolidayService;
+
+    /**
+     * 查询休假管理列表
+     */
+    @SaCheckPermission("oa:oaHoliday:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysOaHolidayVo> list(SysOaHolidayBo bo, PageQuery pageQuery) {
+        return iSysOaHolidayService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出休假管理列表
+     */
+    @SaCheckPermission("oa:oaHoliday:export")
+    @Log(title = "休假管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysOaHolidayBo bo, HttpServletResponse response) {
+        List<SysOaHolidayVo> list = iSysOaHolidayService.queryList(bo);
+        ExcelUtil.exportExcel(list, "休假管理", SysOaHolidayVo.class, response);
+    }
+
+    /**
+     * 获取休假管理详细信息
+     *
+     * @param holidayId 主键
+     */
+    @SaCheckPermission("oa:oaHoliday:query")
+    @GetMapping("/{holidayId}")
+    public R<SysOaHolidayVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long holidayId) {
+        return R.ok(iSysOaHolidayService.queryById(holidayId));
+    }
+
+    /**
+     * 新增休假管理
+     */
+    @SaCheckPermission("oa:oaHoliday:add")
+    @Log(title = "休假管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOaHolidayBo bo) {
+        return toAjax(iSysOaHolidayService.insertByBo(bo));
+    }
+
+    /**
+     * 修改休假管理
+     */
+    @SaCheckPermission("oa:oaHoliday:edit")
+    @Log(title = "休假管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOaHolidayBo bo) {
+        return toAjax(iSysOaHolidayService.updateByBo(bo));
+    }
+
+    /**
+     * 删除休假管理
+     *
+     * @param holidayIds 主键串
+     */
+    @SaCheckPermission("oa:oaHoliday:remove")
+    @Log(title = "休假管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{holidayIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] holidayIds) {
+        return toAjax(iSysOaHolidayService.deleteWithValidByIds(Arrays.asList(holidayIds), true));
+    }
+
+    /**
+     * 查询具体日期返回对象
+     */
+    @GetMapping("/queryHolidayByDate")
+    public R<SysOaHolidayVo> queryHolidayByDate(@NotBlank(message = "日期不能为空") Date date){
+        return R.ok(iSysOaHolidayService.queryHolidayByDate(date));
+    }
+    /**
+     * 根据节假日类别查询
+     */
+    @GetMapping("/queryHolidayByType")
+    public R<List<SysOaHolidayVo>> queryHolidayByType(@NotNull(message = "类别不能为空") Integer type){
+        SysOaHolidayBo bo = new SysOaHolidayBo();
+        bo.setType(type);
+        return R.ok(iSysOaHolidayService.queryList(bo));
+    }
+
+    /**
+     * 查询当前月的所有休假
+     */
+    @GetMapping("/queryHolidayByMonth")
+    public R<List<SysOaHolidayVo>> queryHolidayByMonth(){
+        SysOaHolidayBo bo = new SysOaHolidayBo();
+        Date date = new Date();
+        bo.setHolidayTime(date);
+        return R.ok(iSysOaHolidayService.queryList(bo));
+    }
+}
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaHoliday.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaHoliday.java
new file mode 100644
index 0000000..3c3da4e
--- /dev/null
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaHoliday.java
@@ -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;
+
+}
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaHolidayBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaHolidayBo.java
new file mode 100644
index 0000000..6d854e8
--- /dev/null
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaHolidayBo.java
@@ -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;
+
+
+}
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaHolidayVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaHolidayVo.java
new file mode 100644
index 0000000..49291a6
--- /dev/null
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaHolidayVo.java
@@ -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;
+
+
+}
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaHolidayMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaHolidayMapper.java
new file mode 100644
index 0000000..37debd8
--- /dev/null
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaHolidayMapper.java
@@ -0,0 +1,15 @@
+package com.ruoyi.oa.mapper;
+
+import com.ruoyi.oa.domain.SysOaHoliday;
+import com.ruoyi.oa.domain.vo.SysOaHolidayVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 休假管理Mapper接口
+ *
+ * @author liuzongkun999
+ * @date 2025-02-20
+ */
+public interface SysOaHolidayMapper extends BaseMapperPlus<SysOaHolidayMapper, SysOaHoliday, SysOaHolidayVo> {
+
+}
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaHolidayService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaHolidayService.java
new file mode 100644
index 0000000..5c3fd03
--- /dev/null
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaHolidayService.java
@@ -0,0 +1,56 @@
+package com.ruoyi.oa.service;
+
+import com.ruoyi.oa.domain.SysOaHoliday;
+import com.ruoyi.oa.domain.vo.SysOaHolidayVo;
+import com.ruoyi.oa.domain.bo.SysOaHolidayBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 休假管理Service接口
+ *
+ * @author liuzongkun999
+ * @date 2025-02-20
+ */
+public interface ISysOaHolidayService {
+
+    /**
+     * 查询休假管理
+     */
+    SysOaHolidayVo queryById(Long holidayId);
+
+    /**
+     * 查询休假管理列表
+     */
+    TableDataInfo<SysOaHolidayVo> queryPageList(SysOaHolidayBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询休假管理列表
+     */
+    List<SysOaHolidayVo> queryList(SysOaHolidayBo bo);
+
+    /**
+     * 新增休假管理
+     */
+    Boolean insertByBo(SysOaHolidayBo bo);
+
+    /**
+     * 修改休假管理
+     */
+    Boolean updateByBo(SysOaHolidayBo bo);
+
+    /**
+     * 校验并批量删除休假管理信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 查询指定日期的休假信息
+     */
+    SysOaHolidayVo queryHolidayByDate(@NotBlank(message = "日期不能为空") Date date);
+}
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaHolidayServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaHolidayServiceImpl.java
new file mode 100644
index 0000000..c49a3e7
--- /dev/null
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaHolidayServiceImpl.java
@@ -0,0 +1,122 @@
+package com.ruoyi.oa.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.domain.bo.SysOaHolidayBo;
+import com.ruoyi.oa.domain.vo.SysOaHolidayVo;
+import com.ruoyi.oa.domain.SysOaHoliday;
+import com.ruoyi.oa.mapper.SysOaHolidayMapper;
+import com.ruoyi.oa.service.ISysOaHolidayService;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 休假管理Service业务层处理
+ *
+ * @author liuzongkun999
+ * @date 2025-02-20
+ */
+@RequiredArgsConstructor
+@Service
+public class SysOaHolidayServiceImpl implements ISysOaHolidayService {
+
+    private final SysOaHolidayMapper baseMapper;
+
+    /**
+     * 查询休假管理
+     */
+    @Override
+    public SysOaHolidayVo queryById(Long holidayId){
+        return baseMapper.selectVoById(holidayId);
+    }
+
+    /**
+     * 查询休假管理列表
+     */
+    @Override
+    public TableDataInfo<SysOaHolidayVo> queryPageList(SysOaHolidayBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysOaHoliday> lqw = buildQueryWrapper(bo);
+        Page<SysOaHolidayVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询休假管理列表
+     */
+    @Override
+    public List<SysOaHolidayVo> queryList(SysOaHolidayBo bo) {
+        LambdaQueryWrapper<SysOaHoliday> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysOaHoliday> buildQueryWrapper(SysOaHolidayBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysOaHoliday> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getType() != null, SysOaHoliday::getType, bo.getType());
+        lqw.eq(bo.getHolidayTime() != null, SysOaHoliday::getHolidayTime, bo.getHolidayTime());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), SysOaHoliday::getName, bo.getName());
+        return lqw;
+    }
+
+    /**
+     * 新增休假管理
+     */
+    @Override
+    public Boolean insertByBo(SysOaHolidayBo bo) {
+        SysOaHoliday add = BeanUtil.toBean(bo, SysOaHoliday.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setHolidayId(add.getHolidayId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改休假管理
+     */
+    @Override
+    public Boolean updateByBo(SysOaHolidayBo bo) {
+        SysOaHoliday update = BeanUtil.toBean(bo, SysOaHoliday.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SysOaHoliday entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除休假管理
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 查询指定日期的休假信息
+     */
+    @Override
+    public SysOaHolidayVo queryHolidayByDate(Date date) {
+        LambdaQueryWrapper<SysOaHoliday> lqw = Wrappers.lambdaQuery();
+        lqw.eq(SysOaHoliday::getHolidayTime, date);
+        return baseMapper.selectVoOne(lqw);
+    }
+}
diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaHolidayMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaHolidayMapper.xml
new file mode 100644
index 0000000..349ea06
--- /dev/null
+++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaHolidayMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.SysOaHolidayMapper">
+
+    <resultMap type="com.ruoyi.oa.domain.SysOaHoliday" id="SysOaHolidayResult">
+        <result property="holidayId" column="holiday_id"/>
+        <result property="type" column="type"/>
+        <result property="holidayTime" column="holiday_time"/>
+        <result property="name" column="name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+
+</mapper>