请假流程信息代码生成

yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java

@@ -97,5 +97,7 @@ public interface ErrorCodeConstants {
     ErrorCode OA_RENEW_NOT_EXISTS = new ErrorCode(1009017003, "合同续签流程信息不存在");
     // ========== 离职流程信息 1-009_017_004 ==========
     ErrorCode OA_DIMISSION_NOT_EXISTS = new ErrorCode(1009017004, "离职流程信息不存在");
+    // ========== 请假流程信息 1-009_017_005 ==========
+    ErrorCode OA_HOLIDAY_NOT_EXISTS = new ErrorCode(1009017005, "请假流程信息不存在");
 
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/holiday/OaHolidayController.java

@@ -0,0 +1,96 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.holiday;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.holiday.vo.OaHolidayPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.holiday.vo.OaHolidayRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.holiday.vo.OaHolidaySaveReqVO;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.holiday.OaHolidayDO;
+import cn.iocoder.yudao.module.bpm.service.oa.holiday.OaHolidayService;
+
+@Tag(name = "管理后台 - 请假流程信息")
+@RestController
+@RequestMapping("/bpm/oa-holiday")
+@Validated
+public class OaHolidayController {
+
+    @Resource
+    private OaHolidayService oaHolidayService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建请假流程信息")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-holiday:create')")
+    public CommonResult<Long> createOaHoliday(@Valid @RequestBody OaHolidaySaveReqVO createReqVO) {
+        return success(oaHolidayService.createOaHoliday(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新请假流程信息")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-holiday:update')")
+    public CommonResult<Boolean> updateOaHoliday(@Valid @RequestBody OaHolidaySaveReqVO updateReqVO) {
+        oaHolidayService.updateOaHoliday(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除请假流程信息")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('bpm:oa-holiday:delete')")
+    public CommonResult<Boolean> deleteOaHoliday(@RequestParam("id") Long id) {
+        oaHolidayService.deleteOaHoliday(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得请假流程信息")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-holiday:query')")
+    public CommonResult<OaHolidayRespVO> getOaHoliday(@RequestParam("id") Long id) {
+        OaHolidayDO oaHoliday = oaHolidayService.getOaHoliday(id);
+        return success(BeanUtils.toBean(oaHoliday, OaHolidayRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得请假流程信息分页")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-holiday:query')")
+    public CommonResult<PageResult<OaHolidayRespVO>> getOaHolidayPage(@Valid OaHolidayPageReqVO pageReqVO) {
+        PageResult<OaHolidayDO> pageResult = oaHolidayService.getOaHolidayPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, OaHolidayRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出请假流程信息 Excel")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-holiday:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportOaHolidayExcel(@Valid OaHolidayPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<OaHolidayDO> list = oaHolidayService.getOaHolidayPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "请假流程信息.xls", "数据", OaHolidayRespVO.class,
+                        BeanUtils.toBean(list, OaHolidayRespVO.class));
+    }
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/holiday/vo/OaHolidayPageReqVO.java

@@ -0,0 +1,100 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.holiday.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 请假流程信息分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class OaHolidayPageReqVO extends PageParam {
+
+    @Schema(description = "uuid", example = "20728")
+    private String holidayId;
+
+    @Schema(description = "转正人id", example = "12388")
+    private Long employeeId;
+
+    @Schema(description = "转正人uuid", example = "31445")
+    private String employeeUuid;
+
+    @Schema(description = "转正员工姓名", example = "王五")
+    private String employeeName;
+
+    @Schema(description = "用户账号id", example = "25603")
+    private Long userId;
+
+    @Schema(description = "用户账号uuid", example = "13640")
+    private String userUuid;
+
+    @Schema(description = "部门id", example = "26110")
+    private Long deptId;
+
+    @Schema(description = "部门uuid", example = "24393")
+    private String deptUuid;
+
+    @Schema(description = "员工职位")
+    private String position;
+
+    @Schema(description = "请假类型", example = "1")
+    private String holidayType;
+
+    @Schema(description = "开始日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String[] startDate;
+
+    @Schema(description = "结束日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String[] endDate;
+
+    @Schema(description = "请假天数")
+    private String day;
+
+    @Schema(description = "具体到上下午，am上午 pm下午")
+    private String startTime;
+
+    @Schema(description = "具体到上下午，am上午 pm下午")
+    private String endTime;
+
+    @Schema(description = "请假原因", example = "不好")
+    private String reason;
+
+    @Schema(description = "备注")
+    private String remarks;
+
+    @Schema(description = "流程实例id", example = "26074")
+    private String procInstId;
+
+    @Schema(description = "审核状态（0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回）", example = "2")
+    private String auditStatus;
+
+    @Schema(description = "当前审核人用户id", example = "19230")
+    private Long currentAuditUserId;
+
+    @Schema(description = "当前审核人用户uuid", example = "30632")
+    private String currentAuditUserUuid;
+
+    @Schema(description = "当前审核人员工id", example = "7920")
+    private Long currentAuditEmployeeId;
+
+    @Schema(description = "当前审核人员工uuid", example = "18105")
+    private String currentAuditEmployeeUuid;
+
+    @Schema(description = "最后审核时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] finalAuditDate;
+
+    @Schema(description = "数据来源，0流程添加、1手动添加")
+    private String infoSource;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/holiday/vo/OaHolidayRespVO.java

@@ -0,0 +1,124 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.holiday.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 请假流程信息 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class OaHolidayRespVO {
+
+    @Schema(description = "请假表单主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "26233")
+    @ExcelProperty("请假表单主键")
+    private Long id;
+
+    @Schema(description = "uuid", example = "20728")
+    @ExcelProperty("uuid")
+    private String holidayId;
+
+    @Schema(description = "转正人id", example = "12388")
+    @ExcelProperty("转正人id")
+    private Long employeeId;
+
+    @Schema(description = "转正人uuid", example = "31445")
+    @ExcelProperty("转正人uuid")
+    private String employeeUuid;
+
+    @Schema(description = "转正员工姓名", example = "王五")
+    @ExcelProperty("转正员工姓名")
+    private String employeeName;
+
+    @Schema(description = "用户账号id", example = "25603")
+    @ExcelProperty("用户账号id")
+    private Long userId;
+
+    @Schema(description = "用户账号uuid", example = "13640")
+    @ExcelProperty("用户账号uuid")
+    private String userUuid;
+
+    @Schema(description = "部门id", example = "26110")
+    @ExcelProperty("部门id")
+    private Long deptId;
+
+    @Schema(description = "部门uuid", example = "24393")
+    @ExcelProperty("部门uuid")
+    private String deptUuid;
+
+    @Schema(description = "员工职位")
+    @ExcelProperty("员工职位")
+    private String position;
+
+    @Schema(description = "请假类型", example = "1")
+    @ExcelProperty("请假类型")
+    private String holidayType;
+
+    @Schema(description = "开始日期")
+    @ExcelProperty("开始日期")
+    private String startDate;
+
+    @Schema(description = "结束日期")
+    @ExcelProperty("结束日期")
+    private String endDate;
+
+    @Schema(description = "请假天数")
+    @ExcelProperty("请假天数")
+    private String day;
+
+    @Schema(description = "具体到上下午，am上午 pm下午")
+    @ExcelProperty("具体到上下午，am上午 pm下午")
+    private String startTime;
+
+    @Schema(description = "具体到上下午，am上午 pm下午")
+    @ExcelProperty("具体到上下午，am上午 pm下午")
+    private String endTime;
+
+    @Schema(description = "请假原因", example = "不好")
+    @ExcelProperty("请假原因")
+    private String reason;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remarks;
+
+    @Schema(description = "流程实例id", example = "26074")
+    @ExcelProperty("流程实例id")
+    private String procInstId;
+
+    @Schema(description = "审核状态（0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回）", example = "2")
+    @ExcelProperty("审核状态（0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回）")
+    private String auditStatus;
+
+    @Schema(description = "当前审核人用户id", example = "19230")
+    @ExcelProperty("当前审核人用户id")
+    private Long currentAuditUserId;
+
+    @Schema(description = "当前审核人用户uuid", example = "30632")
+    @ExcelProperty("当前审核人用户uuid")
+    private String currentAuditUserUuid;
+
+    @Schema(description = "当前审核人员工id", example = "7920")
+    @ExcelProperty("当前审核人员工id")
+    private Long currentAuditEmployeeId;
+
+    @Schema(description = "当前审核人员工uuid", example = "18105")
+    @ExcelProperty("当前审核人员工uuid")
+    private String currentAuditEmployeeUuid;
+
+    @Schema(description = "最后审核时间")
+    @ExcelProperty("最后审核时间")
+    private LocalDateTime finalAuditDate;
+
+    @Schema(description = "数据来源，0流程添加、1手动添加")
+    @ExcelProperty("数据来源，0流程添加、1手动添加")
+    private String infoSource;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/holiday/vo/OaHolidaySaveReqVO.java

@@ -0,0 +1,92 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.holiday.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 请假流程信息新增/修改 Request VO")
+@Data
+public class OaHolidaySaveReqVO {
+
+    @Schema(description = "请假表单主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "26233")
+    private Long id;
+
+    @Schema(description = "uuid", example = "20728")
+    private String holidayId;
+
+    @Schema(description = "转正人id", example = "12388")
+    private Long employeeId;
+
+    @Schema(description = "转正人uuid", example = "31445")
+    private String employeeUuid;
+
+    @Schema(description = "转正员工姓名", example = "王五")
+    private String employeeName;
+
+    @Schema(description = "用户账号id", example = "25603")
+    private Long userId;
+
+    @Schema(description = "用户账号uuid", example = "13640")
+    private String userUuid;
+
+    @Schema(description = "部门id", example = "26110")
+    private Long deptId;
+
+    @Schema(description = "部门uuid", example = "24393")
+    private String deptUuid;
+
+    @Schema(description = "员工职位")
+    private String position;
+
+    @Schema(description = "请假类型", example = "1")
+    private String holidayType;
+
+    @Schema(description = "开始日期")
+    private String startDate;
+
+    @Schema(description = "结束日期")
+    private String endDate;
+
+    @Schema(description = "请假天数")
+    private String day;
+
+    @Schema(description = "具体到上下午，am上午 pm下午")
+    private String startTime;
+
+    @Schema(description = "具体到上下午，am上午 pm下午")
+    private String endTime;
+
+    @Schema(description = "请假原因", example = "不好")
+    private String reason;
+
+    @Schema(description = "备注")
+    private String remarks;
+
+    @Schema(description = "流程实例id", example = "26074")
+    private String procInstId;
+
+    @Schema(description = "审核状态（0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回）", example = "2")
+    private String auditStatus;
+
+    @Schema(description = "当前审核人用户id", example = "19230")
+    private Long currentAuditUserId;
+
+    @Schema(description = "当前审核人用户uuid", example = "30632")
+    private String currentAuditUserUuid;
+
+    @Schema(description = "当前审核人员工id", example = "7920")
+    private Long currentAuditEmployeeId;
+
+    @Schema(description = "当前审核人员工uuid", example = "18105")
+    private String currentAuditEmployeeUuid;
+
+    @Schema(description = "最后审核时间")
+    private LocalDateTime finalAuditDate;
+
+    @Schema(description = "数据来源，0流程添加、1手动添加")
+    private String infoSource;
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/holiday/OaHolidayDO.java

@@ -0,0 +1,132 @@
+package cn.iocoder.yudao.module.bpm.dal.dataobject.oa.holiday;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 请假流程信息 DO
+ *
+ * @author dp
+ */
+@TableName("bpm_oa_holiday")
+@KeySequence("bpm_oa_holiday_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OaHolidayDO extends BaseDO {
+
+    /**
+     * 请假表单主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * uuid
+     */
+    private String holidayId;
+    /**
+     * 转正人id
+     */
+    private Long employeeId;
+    /**
+     * 转正人uuid
+     */
+    private String employeeUuid;
+    /**
+     * 转正员工姓名
+     */
+    private String employeeName;
+    /**
+     * 用户账号id
+     */
+    private Long userId;
+    /**
+     * 用户账号uuid
+     */
+    private String userUuid;
+    /**
+     * 部门id
+     */
+    private Long deptId;
+    /**
+     * 部门uuid
+     */
+    private String deptUuid;
+    /**
+     * 员工职位
+     */
+    private String position;
+    /**
+     * 请假类型
+     */
+    private String holidayType;
+    /**
+     * 开始日期
+     */
+    private String startDate;
+    /**
+     * 结束日期
+     */
+    private String endDate;
+    /**
+     * 请假天数
+     */
+    private String day;
+    /**
+     * 具体到上下午，am上午 pm下午
+     */
+    private String startTime;
+    /**
+     * 具体到上下午，am上午 pm下午
+     */
+    private String endTime;
+    /**
+     * 请假原因
+     */
+    private String reason;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 流程实例id
+     */
+    private String procInstId;
+    /**
+     * 审核状态（0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回）
+     */
+    private String auditStatus;
+    /**
+     * 当前审核人用户id
+     */
+    private Long currentAuditUserId;
+    /**
+     * 当前审核人用户uuid
+     */
+    private String currentAuditUserUuid;
+    /**
+     * 当前审核人员工id
+     */
+    private Long currentAuditEmployeeId;
+    /**
+     * 当前审核人员工uuid
+     */
+    private String currentAuditEmployeeUuid;
+    /**
+     * 最后审核时间
+     */
+    private LocalDateTime finalAuditDate;
+    /**
+     * 数据来源，0流程添加、1手动添加
+     */
+    private String infoSource;
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/holiday/OaHolidayMapper.java

@@ -0,0 +1,49 @@
+package cn.iocoder.yudao.module.bpm.dal.mysql.oa.holiday;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.holiday.vo.OaHolidayPageReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.holiday.OaHolidayDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 请假流程信息 Mapper
+ *
+ * @author dp
+ */
+@Mapper
+public interface OaHolidayMapper extends BaseMapperX<OaHolidayDO> {
+
+    default PageResult<OaHolidayDO> selectPage(OaHolidayPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<OaHolidayDO>()
+                .eqIfPresent(OaHolidayDO::getHolidayId, reqVO.getHolidayId())
+                .eqIfPresent(OaHolidayDO::getEmployeeId, reqVO.getEmployeeId())
+                .eqIfPresent(OaHolidayDO::getEmployeeUuid, reqVO.getEmployeeUuid())
+                .likeIfPresent(OaHolidayDO::getEmployeeName, reqVO.getEmployeeName())
+                .eqIfPresent(OaHolidayDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(OaHolidayDO::getUserUuid, reqVO.getUserUuid())
+                .eqIfPresent(OaHolidayDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(OaHolidayDO::getDeptUuid, reqVO.getDeptUuid())
+                .eqIfPresent(OaHolidayDO::getPosition, reqVO.getPosition())
+                .eqIfPresent(OaHolidayDO::getHolidayType, reqVO.getHolidayType())
+                .betweenIfPresent(OaHolidayDO::getStartDate, reqVO.getStartDate())
+                .betweenIfPresent(OaHolidayDO::getEndDate, reqVO.getEndDate())
+                .eqIfPresent(OaHolidayDO::getDay, reqVO.getDay())
+                .eqIfPresent(OaHolidayDO::getStartTime, reqVO.getStartTime())
+                .eqIfPresent(OaHolidayDO::getEndTime, reqVO.getEndTime())
+                .eqIfPresent(OaHolidayDO::getReason, reqVO.getReason())
+                .eqIfPresent(OaHolidayDO::getRemarks, reqVO.getRemarks())
+                .eqIfPresent(OaHolidayDO::getProcInstId, reqVO.getProcInstId())
+                .eqIfPresent(OaHolidayDO::getAuditStatus, reqVO.getAuditStatus())
+                .eqIfPresent(OaHolidayDO::getCurrentAuditUserId, reqVO.getCurrentAuditUserId())
+                .eqIfPresent(OaHolidayDO::getCurrentAuditUserUuid, reqVO.getCurrentAuditUserUuid())
+                .eqIfPresent(OaHolidayDO::getCurrentAuditEmployeeId, reqVO.getCurrentAuditEmployeeId())
+                .eqIfPresent(OaHolidayDO::getCurrentAuditEmployeeUuid, reqVO.getCurrentAuditEmployeeUuid())
+                .betweenIfPresent(OaHolidayDO::getFinalAuditDate, reqVO.getFinalAuditDate())
+                .eqIfPresent(OaHolidayDO::getInfoSource, reqVO.getInfoSource())
+                .betweenIfPresent(OaHolidayDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(OaHolidayDO::getId));
+    }
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/holiday/OaHolidayService.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.bpm.service.oa.holiday;
+
+import javax.validation.*;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.holiday.vo.OaHolidayPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.holiday.vo.OaHolidaySaveReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.holiday.OaHolidayDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+/**
+ * 请假流程信息 Service 接口
+ *
+ * @author dp
+ */
+public interface OaHolidayService {
+
+    /**
+     * 创建请假流程信息
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createOaHoliday(@Valid OaHolidaySaveReqVO createReqVO);
+
+    /**
+     * 更新请假流程信息
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateOaHoliday(@Valid OaHolidaySaveReqVO updateReqVO);
+
+    /**
+     * 删除请假流程信息
+     *
+     * @param id 编号
+     */
+    void deleteOaHoliday(Long id);
+
+    /**
+     * 获得请假流程信息
+     *
+     * @param id 编号
+     * @return 请假流程信息
+     */
+    OaHolidayDO getOaHoliday(Long id);
+
+    /**
+     * 获得请假流程信息分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 请假流程信息分页
+     */
+    PageResult<OaHolidayDO> getOaHolidayPage(OaHolidayPageReqVO pageReqVO);
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/holiday/OaHolidayServiceImpl.java

@@ -0,0 +1,72 @@
+package cn.iocoder.yudao.module.bpm.service.oa.holiday;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.holiday.vo.OaHolidayPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.holiday.vo.OaHolidaySaveReqVO;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.holiday.OaHolidayDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import cn.iocoder.yudao.module.bpm.dal.mysql.oa.holiday.OaHolidayMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*;
+
+/**
+ * 请假流程信息 Service 实现类
+ *
+ * @author dp
+ */
+@Service
+@Validated
+public class OaHolidayServiceImpl implements OaHolidayService {
+
+    @Resource
+    private OaHolidayMapper oaHolidayMapper;
+
+    @Override
+    public Long createOaHoliday(OaHolidaySaveReqVO createReqVO) {
+        // 插入
+        OaHolidayDO oaHoliday = BeanUtils.toBean(createReqVO, OaHolidayDO.class);
+        oaHolidayMapper.insert(oaHoliday);
+        // 返回
+        return oaHoliday.getId();
+    }
+
+    @Override
+    public void updateOaHoliday(OaHolidaySaveReqVO updateReqVO) {
+        // 校验存在
+        validateOaHolidayExists(updateReqVO.getId());
+        // 更新
+        OaHolidayDO updateObj = BeanUtils.toBean(updateReqVO, OaHolidayDO.class);
+        oaHolidayMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteOaHoliday(Long id) {
+        // 校验存在
+        validateOaHolidayExists(id);
+        // 删除
+        oaHolidayMapper.deleteById(id);
+    }
+
+    private void validateOaHolidayExists(Long id) {
+        if (oaHolidayMapper.selectById(id) == null) {
+            throw exception(OA_HOLIDAY_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public OaHolidayDO getOaHoliday(Long id) {
+        return oaHolidayMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<OaHolidayDO> getOaHolidayPage(OaHolidayPageReqVO pageReqVO) {
+        return oaHolidayMapper.selectPage(pageReqVO);
+    }
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/holiday/OaHolidayMapper.xml

@@ -0,0 +1,12 @@
+<?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="cn.iocoder.yudao.module.bpm.dal.mysql.oa.holiday.OaHolidayMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/oa/holiday/OaHolidayServiceImplTest.java

@@ -0,0 +1,225 @@
+package cn.iocoder.yudao.module.bpm.service.oa.holiday;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.holiday.vo.OaHolidayPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.holiday.vo.OaHolidaySaveReqVO;
+import cn.iocoder.yudao.module.bpm.service.oa.holiday.OaHolidayServiceImpl;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import javax.annotation.Resource;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.holiday.OaHolidayDO;
+import cn.iocoder.yudao.module.bpm.dal.mysql.oa.holiday.OaHolidayMapper;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+import org.springframework.context.annotation.Import;
+
+import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
+import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*;
+import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * {@link OaHolidayServiceImpl} 的单元测试类
+ *
+ * @author dp
+ */
+@Import(OaHolidayServiceImpl.class)
+public class OaHolidayServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private OaHolidayServiceImpl oaHolidayService;
+
+    @Resource
+    private OaHolidayMapper oaHolidayMapper;
+
+    @Test
+    public void testCreateOaHoliday_success() {
+        // 准备参数
+        OaHolidaySaveReqVO createReqVO = randomPojo(OaHolidaySaveReqVO.class).setId(null);
+
+        // 调用
+        Long oaHolidayId = oaHolidayService.createOaHoliday(createReqVO);
+        // 断言
+        assertNotNull(oaHolidayId);
+        // 校验记录的属性是否正确
+        OaHolidayDO oaHoliday = oaHolidayMapper.selectById(oaHolidayId);
+        assertPojoEquals(createReqVO, oaHoliday, "id");
+    }
+
+    @Test
+    public void testUpdateOaHoliday_success() {
+        // mock 数据
+        OaHolidayDO dbOaHoliday = randomPojo(OaHolidayDO.class);
+        oaHolidayMapper.insert(dbOaHoliday);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        OaHolidaySaveReqVO updateReqVO = randomPojo(OaHolidaySaveReqVO.class, o -> {
+            o.setId(dbOaHoliday.getId()); // 设置更新的 ID
+        });
+
+        // 调用
+        oaHolidayService.updateOaHoliday(updateReqVO);
+        // 校验是否更新正确
+        OaHolidayDO oaHoliday = oaHolidayMapper.selectById(updateReqVO.getId()); // 获取最新的
+        assertPojoEquals(updateReqVO, oaHoliday);
+    }
+
+    @Test
+    public void testUpdateOaHoliday_notExists() {
+        // 准备参数
+        OaHolidaySaveReqVO updateReqVO = randomPojo(OaHolidaySaveReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> oaHolidayService.updateOaHoliday(updateReqVO), OA_HOLIDAY_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteOaHoliday_success() {
+        // mock 数据
+        OaHolidayDO dbOaHoliday = randomPojo(OaHolidayDO.class);
+        oaHolidayMapper.insert(dbOaHoliday);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbOaHoliday.getId();
+
+        // 调用
+        oaHolidayService.deleteOaHoliday(id);
+       // 校验数据不存在了
+       assertNull(oaHolidayMapper.selectById(id));
+    }
+
+    @Test
+    public void testDeleteOaHoliday_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> oaHolidayService.deleteOaHoliday(id), OA_HOLIDAY_NOT_EXISTS);
+    }
+
+    @Test
+    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
+    public void testGetOaHolidayPage() {
+       // mock 数据
+       OaHolidayDO dbOaHoliday = randomPojo(OaHolidayDO.class, o -> { // 等会查询到
+           o.setHolidayId(null);
+           o.setEmployeeId(null);
+           o.setEmployeeUuid(null);
+           o.setEmployeeName(null);
+           o.setUserId(null);
+           o.setUserUuid(null);
+           o.setDeptId(null);
+           o.setDeptUuid(null);
+           o.setPosition(null);
+           o.setHolidayType(null);
+           o.setStartDate(null);
+           o.setEndDate(null);
+           o.setDay(null);
+           o.setStartTime(null);
+           o.setEndTime(null);
+           o.setReason(null);
+           o.setRemarks(null);
+           o.setProcInstId(null);
+           o.setAuditStatus(null);
+           o.setCurrentAuditUserId(null);
+           o.setCurrentAuditUserUuid(null);
+           o.setCurrentAuditEmployeeId(null);
+           o.setCurrentAuditEmployeeUuid(null);
+           o.setFinalAuditDate(null);
+           o.setInfoSource(null);
+           o.setCreateTime(null);
+       });
+       oaHolidayMapper.insert(dbOaHoliday);
+       // 测试 holidayId 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setHolidayId(null)));
+       // 测试 employeeId 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setEmployeeId(null)));
+       // 测试 employeeUuid 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setEmployeeUuid(null)));
+       // 测试 employeeName 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setEmployeeName(null)));
+       // 测试 userId 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setUserId(null)));
+       // 测试 userUuid 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setUserUuid(null)));
+       // 测试 deptId 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setDeptId(null)));
+       // 测试 deptUuid 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setDeptUuid(null)));
+       // 测试 position 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setPosition(null)));
+       // 测试 holidayType 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setHolidayType(null)));
+       // 测试 startDate 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setStartDate(null)));
+       // 测试 endDate 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setEndDate(null)));
+       // 测试 day 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setDay(null)));
+       // 测试 startTime 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setStartTime(null)));
+       // 测试 endTime 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setEndTime(null)));
+       // 测试 reason 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setReason(null)));
+       // 测试 remarks 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setRemarks(null)));
+       // 测试 procInstId 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setProcInstId(null)));
+       // 测试 auditStatus 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setAuditStatus(null)));
+       // 测试 currentAuditUserId 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setCurrentAuditUserId(null)));
+       // 测试 currentAuditUserUuid 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setCurrentAuditUserUuid(null)));
+       // 测试 currentAuditEmployeeId 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setCurrentAuditEmployeeId(null)));
+       // 测试 currentAuditEmployeeUuid 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setCurrentAuditEmployeeUuid(null)));
+       // 测试 finalAuditDate 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setFinalAuditDate(null)));
+       // 测试 infoSource 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setInfoSource(null)));
+       // 测试 createTime 不匹配
+       oaHolidayMapper.insert(cloneIgnoreId(dbOaHoliday, o -> o.setCreateTime(null)));
+       // 准备参数
+       OaHolidayPageReqVO reqVO = new OaHolidayPageReqVO();
+       reqVO.setHolidayId(null);
+       reqVO.setEmployeeId(null);
+       reqVO.setEmployeeUuid(null);
+       reqVO.setEmployeeName(null);
+       reqVO.setUserId(null);
+       reqVO.setUserUuid(null);
+       reqVO.setDeptId(null);
+       reqVO.setDeptUuid(null);
+       reqVO.setPosition(null);
+       reqVO.setHolidayType(null);
+       reqVO.setStartDate(null);
+       reqVO.setEndDate(null);
+       reqVO.setDay(null);
+       reqVO.setStartTime(null);
+       reqVO.setEndTime(null);
+       reqVO.setReason(null);
+       reqVO.setRemarks(null);
+       reqVO.setProcInstId(null);
+       reqVO.setAuditStatus(null);
+       reqVO.setCurrentAuditUserId(null);
+       reqVO.setCurrentAuditUserUuid(null);
+       reqVO.setCurrentAuditEmployeeId(null);
+       reqVO.setCurrentAuditEmployeeUuid(null);
+       reqVO.setFinalAuditDate(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+       reqVO.setInfoSource(null);
+       reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
+
+       // 调用
+       PageResult<OaHolidayDO> pageResult = oaHolidayService.getOaHolidayPage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbOaHoliday, pageResult.getList().get(0));
+    }
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/sql/clean.sql

@@ -6,4 +6,6 @@ DELETE FROM "bpm_oa_conversion";
 -- 将该删表 SQL 语句，添加到 yudao-module-bpm-biz 模块的 test/resources/sql/clean.sql 文件里
 DELETE FROM "bpm_oa_renew";
 -- 将该删表 SQL 语句，添加到 yudao-module-bpm-biz 模块的 test/resources/sql/clean.sql 文件里
-DELETE FROM "bpm_oa_dimission";
+DELETE FROM "bpm_oa_dimission";
+-- 将该删表 SQL 语句，添加到 yudao-module-bpm-biz 模块的 test/resources/sql/clean.sql 文件里
+DELETE FROM "bpm_oa_holiday";

yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/sql/create_tables.sql

@@ -144,4 +144,39 @@ CREATE TABLE IF NOT EXISTS "bpm_oa_dimission" (
     `deleted` int NOT NULL DEFAULT 0,
     "tenant_id" bigint NOT NULL default 0,
     PRIMARY KEY ("id")
-) COMMENT '离职流程信息表';
+) COMMENT '离职流程信息表';
+-- 将该建表 SQL 语句，添加到 yudao-module-bpm-biz 模块的 test/resources/sql/create_tables.sql 文件里
+CREATE TABLE IF NOT EXISTS "bpm_oa_holiday" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "holiday_id" varchar,
+    "employee_id" bigint,
+    "employee_uuid" varchar,
+    "employee_name" varchar,
+    "user_id" bigint,
+    "user_uuid" varchar,
+    "dept_id" bigint,
+    "dept_uuid" varchar,
+    "position" varchar,
+    "holiday_type" varchar,
+    "start_date" varchar,
+    "end_date" varchar,
+    "day" varchar,
+    "start_time" varchar,
+    "end_time" varchar,
+    "reason" varchar,
+    "remarks" varchar,
+    "proc_inst_id" varchar,
+    "audit_status" varchar,
+    "current_audit_user_id" bigint,
+    "current_audit_user_uuid" varchar,
+    "current_audit_employee_id" bigint,
+    "current_audit_employee_uuid" varchar,
+    "final_audit_date" varchar,
+    "info_source" varchar,
+    "creator" varchar DEFAULT '',
+    "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater" varchar DEFAULT '',
+    "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    "tenant_id" bigint NOT NULL,
+    PRIMARY KEY ("id")
+    ) COMMENT '请假流程信息表';