ソースを参照

通用审批流程信息代码生成

dongpo 1 年間 前
コミット
056c7560aa
13 ファイル変更900 行追加1 行削除
  1. 2 0
      yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
  2. 96 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/universal/OaUniversalController.java
  3. 83 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/universal/vo/OaUniversalPageReqVO.java
  4. 108 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/universal/vo/OaUniversalRespVO.java
  5. 77 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/universal/vo/OaUniversalSaveReqVO.java
  6. 112 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/universal/OaUniversalDO.java
  7. 44 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/universal/OaUniversalMapper.java
  8. 55 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/universal/OaUniversalService.java
  9. 72 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/universal/OaUniversalServiceImpl.java
  10. 12 0
      yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/universal/OaUniversalMapper.xml
  11. 205 0
      yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/oa/universal/OaUniversalServiceImplTest.java
  12. 3 1
      yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/sql/clean.sql
  13. 31 0
      yudao-module-bpm/yudao-module-bpm-biz/src/test/resources/sql/create_tables.sql

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

@@ -99,5 +99,7 @@ public interface ErrorCodeConstants {
     ErrorCode OA_DIMISSION_NOT_EXISTS = new ErrorCode(1009017004, "离职流程信息不存在");
     // ========== 请假流程信息 1-009_017_005 ==========
     ErrorCode OA_HOLIDAY_NOT_EXISTS = new ErrorCode(1009017005, "请假流程信息不存在");
+    // ========== 通用审批流程信息 1-009_017_006 ==========
+    ErrorCode OA_UNIVERSAL_NOT_EXISTS = new ErrorCode(1009017006, "通用审批流程信息不存在");
 
 }

+ 96 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/universal/OaUniversalController.java

@@ -0,0 +1,96 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.universal;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.vo.OaUniversalPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.vo.OaUniversalRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.vo.OaUniversalSaveReqVO;
+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.universal.OaUniversalDO;
+import cn.iocoder.yudao.module.bpm.service.oa.universal.OaUniversalService;
+
+@Tag(name = "管理后台 - 通用审批流程信息")
+@RestController
+@RequestMapping("/bpm/oa-universal")
+@Validated
+public class OaUniversalController {
+
+    @Resource
+    private OaUniversalService oaUniversalService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建通用审批流程信息")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-universal:create')")
+    public CommonResult<Long> createOaUniversal(@Valid @RequestBody OaUniversalSaveReqVO createReqVO) {
+        return success(oaUniversalService.createOaUniversal(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新通用审批流程信息")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-universal:update')")
+    public CommonResult<Boolean> updateOaUniversal(@Valid @RequestBody OaUniversalSaveReqVO updateReqVO) {
+        oaUniversalService.updateOaUniversal(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除通用审批流程信息")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('bpm:oa-universal:delete')")
+    public CommonResult<Boolean> deleteOaUniversal(@RequestParam("id") Long id) {
+        oaUniversalService.deleteOaUniversal(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得通用审批流程信息")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-universal:query')")
+    public CommonResult<OaUniversalRespVO> getOaUniversal(@RequestParam("id") Long id) {
+        OaUniversalDO oaUniversal = oaUniversalService.getOaUniversal(id);
+        return success(BeanUtils.toBean(oaUniversal, OaUniversalRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得通用审批流程信息分页")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-universal:query')")
+    public CommonResult<PageResult<OaUniversalRespVO>> getOaUniversalPage(@Valid OaUniversalPageReqVO pageReqVO) {
+        PageResult<OaUniversalDO> pageResult = oaUniversalService.getOaUniversalPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, OaUniversalRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出通用审批流程信息 Excel")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-universal:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportOaUniversalExcel(@Valid OaUniversalPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<OaUniversalDO> list = oaUniversalService.getOaUniversalPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "通用审批流程信息.xls", "数据", OaUniversalRespVO.class,
+                        BeanUtils.toBean(list, OaUniversalRespVO.class));
+    }
+
+}

+ 83 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/universal/vo/OaUniversalPageReqVO.java

@@ -0,0 +1,83 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.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 OaUniversalPageReqVO extends PageParam {
+
+    @Schema(description = "uuid", example = "12260")
+    private String universalId;
+
+    @Schema(description = "申请人id", example = "14065")
+    private Long employeeId;
+
+    @Schema(description = "申请人uuid", example = "8771")
+    private String employeeUuid;
+
+    @Schema(description = "申请员工姓名", example = "芋艿")
+    private String employeeName;
+
+    @Schema(description = "申请用户账号id", example = "18283")
+    private Long userId;
+
+    @Schema(description = "申请用户账号uuid", example = "28769")
+    private String userUuid;
+
+    @Schema(description = "部门id", example = "12910")
+    private Long deptId;
+
+    @Schema(description = "部门uuid", example = "18681")
+    private String deptUuid;
+
+    @Schema(description = "职位")
+    private String position;
+
+    @Schema(description = "申请事项标题")
+    private String title;
+
+    @Schema(description = "详细描述", example = "随便")
+    private String description;
+
+    @Schema(description = "备注")
+    private String remarks;
+
+    @Schema(description = "流程实例id", example = "18345")
+    private String procInstId;
+
+    @Schema(description = "审核状态(0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回)", example = "1")
+    private String auditStatus;
+
+    @Schema(description = "当前审核人用户id", example = "31811")
+    private Long currentAuditUserId;
+
+    @Schema(description = "当前审核人用户uuid", example = "23687")
+    private String currentAuditUserUuid;
+
+    @Schema(description = "当前审核人员工id", example = "2375")
+    private Long currentAuditEmployeeId;
+
+    @Schema(description = "当前审核人员工uuid", example = "13039")
+    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;
+
+}

+ 108 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/universal/vo/OaUniversalRespVO.java

@@ -0,0 +1,108 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.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 OaUniversalRespVO {
+
+    @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("自增主键")
+    private Long id;
+
+    @Schema(description = "uuid", example = "12260")
+    @ExcelProperty("uuid")
+    private String universalId;
+
+    @Schema(description = "申请人id", example = "14065")
+    @ExcelProperty("申请人id")
+    private Long employeeId;
+
+    @Schema(description = "申请人uuid", example = "8771")
+    @ExcelProperty("申请人uuid")
+    private String employeeUuid;
+
+    @Schema(description = "申请员工姓名", example = "芋艿")
+    @ExcelProperty("申请员工姓名")
+    private String employeeName;
+
+    @Schema(description = "申请用户账号id", example = "18283")
+    @ExcelProperty("申请用户账号id")
+    private Long userId;
+
+    @Schema(description = "申请用户账号uuid", example = "28769")
+    @ExcelProperty("申请用户账号uuid")
+    private String userUuid;
+
+    @Schema(description = "部门id", example = "12910")
+    @ExcelProperty("部门id")
+    private Long deptId;
+
+    @Schema(description = "部门uuid", example = "18681")
+    @ExcelProperty("部门uuid")
+    private String deptUuid;
+
+    @Schema(description = "职位")
+    @ExcelProperty("职位")
+    private String position;
+
+    @Schema(description = "申请事项标题")
+    @ExcelProperty("申请事项标题")
+    private String title;
+
+    @Schema(description = "详细描述", example = "随便")
+    @ExcelProperty("详细描述")
+    private String description;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remarks;
+
+    @Schema(description = "流程实例id", example = "18345")
+    @ExcelProperty("流程实例id")
+    private String procInstId;
+
+    @Schema(description = "审核状态(0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回)", example = "1")
+    @ExcelProperty("审核状态(0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回)")
+    private String auditStatus;
+
+    @Schema(description = "当前审核人用户id", example = "31811")
+    @ExcelProperty("当前审核人用户id")
+    private Long currentAuditUserId;
+
+    @Schema(description = "当前审核人用户uuid", example = "23687")
+    @ExcelProperty("当前审核人用户uuid")
+    private String currentAuditUserUuid;
+
+    @Schema(description = "当前审核人员工id", example = "2375")
+    @ExcelProperty("当前审核人员工id")
+    private Long currentAuditEmployeeId;
+
+    @Schema(description = "当前审核人员工uuid", example = "13039")
+    @ExcelProperty("当前审核人员工uuid")
+    private String currentAuditEmployeeUuid;
+
+    @Schema(description = "最后审核时间")
+    @ExcelProperty("最后审核时间")
+    private LocalDateTime finalAuditDate;
+
+    @Schema(description = "数据来源,0流程添加、1手动添加")
+    @ExcelProperty("数据来源,0流程添加、1手动添加")
+    private String infoSource;
+
+    @Schema(description = "创建者")
+    @ExcelProperty("创建者")
+    private String creator;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

+ 77 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/universal/vo/OaUniversalSaveReqVO.java

@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.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 OaUniversalSaveReqVO {
+
+    @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Long id;
+
+    @Schema(description = "uuid", example = "12260")
+    private String universalId;
+
+    @Schema(description = "申请人id", example = "14065")
+    private Long employeeId;
+
+    @Schema(description = "申请人uuid", example = "8771")
+    private String employeeUuid;
+
+    @Schema(description = "申请员工姓名", example = "芋艿")
+    private String employeeName;
+
+    @Schema(description = "申请用户账号id", example = "18283")
+    private Long userId;
+
+    @Schema(description = "申请用户账号uuid", example = "28769")
+    private String userUuid;
+
+    @Schema(description = "部门id", example = "12910")
+    private Long deptId;
+
+    @Schema(description = "部门uuid", example = "18681")
+    private String deptUuid;
+
+    @Schema(description = "职位")
+    private String position;
+
+    @Schema(description = "申请事项标题")
+    private String title;
+
+    @Schema(description = "详细描述", example = "随便")
+    private String description;
+
+    @Schema(description = "备注")
+    private String remarks;
+
+    @Schema(description = "流程实例id", example = "18345")
+    private String procInstId;
+
+    @Schema(description = "审核状态(0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回)", example = "1")
+    private String auditStatus;
+
+    @Schema(description = "当前审核人用户id", example = "31811")
+    private Long currentAuditUserId;
+
+    @Schema(description = "当前审核人用户uuid", example = "23687")
+    private String currentAuditUserUuid;
+
+    @Schema(description = "当前审核人员工id", example = "2375")
+    private Long currentAuditEmployeeId;
+
+    @Schema(description = "当前审核人员工uuid", example = "13039")
+    private String currentAuditEmployeeUuid;
+
+    @Schema(description = "最后审核时间")
+    private LocalDateTime finalAuditDate;
+
+    @Schema(description = "数据来源,0流程添加、1手动添加")
+    private String infoSource;
+
+}

+ 112 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/universal/OaUniversalDO.java

@@ -0,0 +1,112 @@
+package cn.iocoder.yudao.module.bpm.dal.dataobject.oa.universal;
+
+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_universal")
+@KeySequence("bpm_oa_universal_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OaUniversalDO extends BaseDO {
+
+    /**
+     * 自增主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * uuid
+     */
+    private String universalId;
+    /**
+     * 申请人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 title;
+    /**
+     * 详细描述
+     */
+    private String description;
+    /**
+     * 备注
+     */
+    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;
+
+}

+ 44 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/universal/OaUniversalMapper.java

@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.bpm.dal.mysql.oa.universal;
+
+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.universal.vo.OaUniversalPageReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.universal.OaUniversalDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 通用审批流程信息 Mapper
+ *
+ * @author dp
+ */
+@Mapper
+public interface OaUniversalMapper extends BaseMapperX<OaUniversalDO> {
+
+    default PageResult<OaUniversalDO> selectPage(OaUniversalPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<OaUniversalDO>()
+                .eqIfPresent(OaUniversalDO::getUniversalId, reqVO.getUniversalId())
+                .eqIfPresent(OaUniversalDO::getEmployeeId, reqVO.getEmployeeId())
+                .eqIfPresent(OaUniversalDO::getEmployeeUuid, reqVO.getEmployeeUuid())
+                .likeIfPresent(OaUniversalDO::getEmployeeName, reqVO.getEmployeeName())
+                .eqIfPresent(OaUniversalDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(OaUniversalDO::getUserUuid, reqVO.getUserUuid())
+                .eqIfPresent(OaUniversalDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(OaUniversalDO::getDeptUuid, reqVO.getDeptUuid())
+                .eqIfPresent(OaUniversalDO::getPosition, reqVO.getPosition())
+                .eqIfPresent(OaUniversalDO::getTitle, reqVO.getTitle())
+                .eqIfPresent(OaUniversalDO::getDescription, reqVO.getDescription())
+                .eqIfPresent(OaUniversalDO::getRemarks, reqVO.getRemarks())
+                .eqIfPresent(OaUniversalDO::getProcInstId, reqVO.getProcInstId())
+                .eqIfPresent(OaUniversalDO::getAuditStatus, reqVO.getAuditStatus())
+                .eqIfPresent(OaUniversalDO::getCurrentAuditUserId, reqVO.getCurrentAuditUserId())
+                .eqIfPresent(OaUniversalDO::getCurrentAuditUserUuid, reqVO.getCurrentAuditUserUuid())
+                .eqIfPresent(OaUniversalDO::getCurrentAuditEmployeeId, reqVO.getCurrentAuditEmployeeId())
+                .eqIfPresent(OaUniversalDO::getCurrentAuditEmployeeUuid, reqVO.getCurrentAuditEmployeeUuid())
+                .betweenIfPresent(OaUniversalDO::getFinalAuditDate, reqVO.getFinalAuditDate())
+                .eqIfPresent(OaUniversalDO::getInfoSource, reqVO.getInfoSource())
+                .betweenIfPresent(OaUniversalDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(OaUniversalDO::getId));
+    }
+
+}

+ 55 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/universal/OaUniversalService.java

@@ -0,0 +1,55 @@
+package cn.iocoder.yudao.module.bpm.service.oa.universal;
+
+import javax.validation.*;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.vo.OaUniversalPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.vo.OaUniversalSaveReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.universal.OaUniversalDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+
+/**
+ * 通用审批流程信息 Service 接口
+ *
+ * @author dp
+ */
+public interface OaUniversalService {
+
+    /**
+     * 创建通用审批流程信息
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createOaUniversal(@Valid OaUniversalSaveReqVO createReqVO);
+
+    /**
+     * 更新通用审批流程信息
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateOaUniversal(@Valid OaUniversalSaveReqVO updateReqVO);
+
+    /**
+     * 删除通用审批流程信息
+     *
+     * @param id 编号
+     */
+    void deleteOaUniversal(Long id);
+
+    /**
+     * 获得通用审批流程信息
+     *
+     * @param id 编号
+     * @return 通用审批流程信息
+     */
+    OaUniversalDO getOaUniversal(Long id);
+
+    /**
+     * 获得通用审批流程信息分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 通用审批流程信息分页
+     */
+    PageResult<OaUniversalDO> getOaUniversalPage(OaUniversalPageReqVO pageReqVO);
+
+}

+ 72 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/universal/OaUniversalServiceImpl.java

@@ -0,0 +1,72 @@
+package cn.iocoder.yudao.module.bpm.service.oa.universal;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.vo.OaUniversalPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.vo.OaUniversalSaveReqVO;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.universal.OaUniversalDO;
+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.universal.OaUniversalMapper;
+
+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 OaUniversalServiceImpl implements OaUniversalService {
+
+    @Resource
+    private OaUniversalMapper oaUniversalMapper;
+
+    @Override
+    public Long createOaUniversal(OaUniversalSaveReqVO createReqVO) {
+        // 插入
+        OaUniversalDO oaUniversal = BeanUtils.toBean(createReqVO, OaUniversalDO.class);
+        oaUniversalMapper.insert(oaUniversal);
+        // 返回
+        return oaUniversal.getId();
+    }
+
+    @Override
+    public void updateOaUniversal(OaUniversalSaveReqVO updateReqVO) {
+        // 校验存在
+        validateOaUniversalExists(updateReqVO.getId());
+        // 更新
+        OaUniversalDO updateObj = BeanUtils.toBean(updateReqVO, OaUniversalDO.class);
+        oaUniversalMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteOaUniversal(Long id) {
+        // 校验存在
+        validateOaUniversalExists(id);
+        // 删除
+        oaUniversalMapper.deleteById(id);
+    }
+
+    private void validateOaUniversalExists(Long id) {
+        if (oaUniversalMapper.selectById(id) == null) {
+            throw exception(OA_UNIVERSAL_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public OaUniversalDO getOaUniversal(Long id) {
+        return oaUniversalMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<OaUniversalDO> getOaUniversalPage(OaUniversalPageReqVO pageReqVO) {
+        return oaUniversalMapper.selectPage(pageReqVO);
+    }
+
+}

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

+ 205 - 0
yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/service/oa/universal/OaUniversalServiceImplTest.java

@@ -0,0 +1,205 @@
+package cn.iocoder.yudao.module.bpm.service.oa.universal;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.vo.OaUniversalPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.universal.vo.OaUniversalSaveReqVO;
+import cn.iocoder.yudao.module.bpm.service.oa.universal.OaUniversalServiceImpl;
+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.universal.OaUniversalDO;
+import cn.iocoder.yudao.module.bpm.dal.mysql.oa.universal.OaUniversalMapper;
+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 OaUniversalServiceImpl} 的单元测试类
+ *
+ * @author dp
+ */
+@Import(OaUniversalServiceImpl.class)
+public class OaUniversalServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private OaUniversalServiceImpl oaUniversalService;
+
+    @Resource
+    private OaUniversalMapper oaUniversalMapper;
+
+    @Test
+    public void testCreateOaUniversal_success() {
+        // 准备参数
+        OaUniversalSaveReqVO createReqVO = randomPojo(OaUniversalSaveReqVO.class).setId(null);
+
+        // 调用
+        Long oaUniversalId = oaUniversalService.createOaUniversal(createReqVO);
+        // 断言
+        assertNotNull(oaUniversalId);
+        // 校验记录的属性是否正确
+        OaUniversalDO oaUniversal = oaUniversalMapper.selectById(oaUniversalId);
+        assertPojoEquals(createReqVO, oaUniversal, "id");
+    }
+
+    @Test
+    public void testUpdateOaUniversal_success() {
+        // mock 数据
+        OaUniversalDO dbOaUniversal = randomPojo(OaUniversalDO.class);
+        oaUniversalMapper.insert(dbOaUniversal);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        OaUniversalSaveReqVO updateReqVO = randomPojo(OaUniversalSaveReqVO.class, o -> {
+            o.setId(dbOaUniversal.getId()); // 设置更新的 ID
+        });
+
+        // 调用
+        oaUniversalService.updateOaUniversal(updateReqVO);
+        // 校验是否更新正确
+        OaUniversalDO oaUniversal = oaUniversalMapper.selectById(updateReqVO.getId()); // 获取最新的
+        assertPojoEquals(updateReqVO, oaUniversal);
+    }
+
+    @Test
+    public void testUpdateOaUniversal_notExists() {
+        // 准备参数
+        OaUniversalSaveReqVO updateReqVO = randomPojo(OaUniversalSaveReqVO.class);
+
+        // 调用, 并断言异常
+        assertServiceException(() -> oaUniversalService.updateOaUniversal(updateReqVO), OA_UNIVERSAL_NOT_EXISTS);
+    }
+
+    @Test
+    public void testDeleteOaUniversal_success() {
+        // mock 数据
+        OaUniversalDO dbOaUniversal = randomPojo(OaUniversalDO.class);
+        oaUniversalMapper.insert(dbOaUniversal);// @Sql: 先插入出一条存在的数据
+        // 准备参数
+        Long id = dbOaUniversal.getId();
+
+        // 调用
+        oaUniversalService.deleteOaUniversal(id);
+       // 校验数据不存在了
+       assertNull(oaUniversalMapper.selectById(id));
+    }
+
+    @Test
+    public void testDeleteOaUniversal_notExists() {
+        // 准备参数
+        Long id = randomLongId();
+
+        // 调用, 并断言异常
+        assertServiceException(() -> oaUniversalService.deleteOaUniversal(id), OA_UNIVERSAL_NOT_EXISTS);
+    }
+
+    @Test
+    @Disabled  // TODO 请修改 null 为需要的值,然后删除 @Disabled 注解
+    public void testGetOaUniversalPage() {
+       // mock 数据
+       OaUniversalDO dbOaUniversal = randomPojo(OaUniversalDO.class, o -> { // 等会查询到
+           o.setUniversalId(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.setTitle(null);
+           o.setDescription(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);
+       });
+       oaUniversalMapper.insert(dbOaUniversal);
+       // 测试 universalId 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setUniversalId(null)));
+       // 测试 employeeId 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setEmployeeId(null)));
+       // 测试 employeeUuid 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setEmployeeUuid(null)));
+       // 测试 employeeName 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setEmployeeName(null)));
+       // 测试 userId 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setUserId(null)));
+       // 测试 userUuid 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setUserUuid(null)));
+       // 测试 deptId 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setDeptId(null)));
+       // 测试 deptUuid 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setDeptUuid(null)));
+       // 测试 position 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setPosition(null)));
+       // 测试 title 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setTitle(null)));
+       // 测试 description 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setDescription(null)));
+       // 测试 remarks 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setRemarks(null)));
+       // 测试 procInstId 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setProcInstId(null)));
+       // 测试 auditStatus 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setAuditStatus(null)));
+       // 测试 currentAuditUserId 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setCurrentAuditUserId(null)));
+       // 测试 currentAuditUserUuid 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setCurrentAuditUserUuid(null)));
+       // 测试 currentAuditEmployeeId 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setCurrentAuditEmployeeId(null)));
+       // 测试 currentAuditEmployeeUuid 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setCurrentAuditEmployeeUuid(null)));
+       // 测试 finalAuditDate 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setFinalAuditDate(null)));
+       // 测试 infoSource 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setInfoSource(null)));
+       // 测试 createTime 不匹配
+       oaUniversalMapper.insert(cloneIgnoreId(dbOaUniversal, o -> o.setCreateTime(null)));
+       // 准备参数
+       OaUniversalPageReqVO reqVO = new OaUniversalPageReqVO();
+       reqVO.setUniversalId(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.setTitle(null);
+       reqVO.setDescription(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<OaUniversalDO> pageResult = oaUniversalService.getOaUniversalPage(reqVO);
+       // 断言
+       assertEquals(1, pageResult.getTotal());
+       assertEquals(1, pageResult.getList().size());
+       assertPojoEquals(dbOaUniversal, pageResult.getList().get(0));
+    }
+
+}

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

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

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

@@ -180,3 +180,34 @@ CREATE TABLE IF NOT EXISTS "bpm_oa_holiday" (
     "tenant_id" bigint NOT NULL,
     PRIMARY KEY ("id")
     ) COMMENT '请假流程信息表';
+-- 将该建表 SQL 语句,添加到 yudao-module-bpm-biz 模块的 test/resources/sql/create_tables.sql 文件里
+CREATE TABLE IF NOT EXISTS "bpm_oa_universal" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "universal_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,
+    "title" varchar,
+    "description" 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,
+    "deleted" bit NOT NULL DEFAULT FALSE,
+    "tenant_id" bigint NOT NULL DEFAULT 0,
+    PRIMARY KEY ("id")
+    ) COMMENT '通用审批流程信息表';