Merge remote-tracking branch 'origin/lc_saas' into master_20240722

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

@@ -111,7 +111,8 @@ public interface ErrorCodeConstants {
     ErrorCode OA_PURCHASE_NOT_EXISTS = new ErrorCode(1_009_017_009, "采购流程信息不存在");
     // ========== 报销流程信息 1_009_017_010 ==========
     ErrorCode OA_EXPENSE_NOT_EXISTS = new ErrorCode(1_009_017_010, "报销流程信息不存在");
-
+    // ========== 用印流程信息 1_009_017_011 ==========
+    ErrorCode OA_STAMP_NOT_EXISTS = new ErrorCode(1_009_017_011, "用印流程信息不存在");
 
     // ========== 员工信息 1_009_018_000 ==========
     ErrorCode OA_EMPLOYEE_NOT_EXISTS = new ErrorCode(1_009_018_000, "员工信息不存在");
@@ -128,4 +129,6 @@ public interface ErrorCodeConstants {
     ErrorCode OA_EXPENSE_OBJ_MONEY_ZERO = new ErrorCode(1_009_018_008, "报销子项报销金额不能为空");
     ErrorCode OA_EXPENSE_OBJ_START_DATE_NULL = new ErrorCode(1_009_018_009, "报销子项开始日期不能为空");
     ErrorCode OA_EXPENSE_OBJ_END_DATE_NULL = new ErrorCode(1_009_018_010, "报销子项结束日期不能为空");
+    // ========== 用印印章信息 1_009_018_011 ==========
+    ErrorCode OA_STAMP_SEAL_NOT_EXISTS = new ErrorCode(1_009_018_011, "用印印章信息不存在");
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/stamp/OaStampController.java

@@ -0,0 +1,156 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.stamp;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.stamp.vo.OaStampPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.stamp.vo.OaStampRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.stamp.vo.OaStampSaveReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskReturnReqVO;
+import cn.iocoder.yudao.module.bpm.service.oa.stamp.OaStampService;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springdoc.api.annotations.ParameterObject;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 用印流程信息")
+@RestController
+@RequestMapping("/bpm/oa-stamp")
+@Validated
+public class OaStampController {
+
+
+    @Resource
+    private OaStampService oaStampService;
+
+    @PostMapping("/staging")
+    @Operation(summary = "暂存用印审批流程信息")
+    @ApiOperationSupport(order = 1)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp:staging')")
+    public CommonResult<Long> stagingOaStamp(@RequestBody OaStampSaveReqVO stagingReqVO) {
+        Long oaStampId = oaStampService.stagingOaStamp(stagingReqVO);
+        return success(oaStampId, "暂存成功");
+    }
+
+    @PostMapping("/commit")
+    @Operation(summary = "提交用印审批流程信息")
+    @ApiOperationSupport(order = 2)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp:commit')")
+    public CommonResult<Long> commitOaStamp(@Valid @RequestBody OaStampSaveReqVO commitReqVO) {
+        Long oaStampId = oaStampService.commitOaStamp(commitReqVO);
+        return success(oaStampId, "提交成功");
+    }
+
+    @PostMapping("/agree")
+    @Operation(summary = "审批同意用印审批流程信息")
+    @ApiOperationSupport(order = 3)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp:agree')")
+    public CommonResult<Long> agreeOaStamp(@Valid @RequestBody BpmTaskApproveReqVO agreeReqVO) {
+        Long result = oaStampService.agreeOaStamp(agreeReqVO);
+        return success(result, "审批成功");
+    }
+
+    @PostMapping("/disagree")
+    @Operation(summary = "驳回用印审批流程信息")
+    @ApiOperationSupport(order = 4)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp:disagree')")
+    public CommonResult<Long> disagreeOaStamp(@Valid @RequestBody BpmTaskReturnReqVO disagreeReqVO) {
+        Long result = oaStampService.disagreeOaStamp(disagreeReqVO);
+        return success(result, "驳回成功");
+    }
+
+    @PostMapping("/revocation")
+    @Operation(summary = "撤回用印审批流程信息")
+    @ApiOperationSupport(order = 5)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp:revocation')")
+    public CommonResult<Long> revocationOaStamp(@Valid @RequestBody BpmTaskApproveReqVO revocationReqVO) {
+        Long result = oaStampService.revocationOaStamp(revocationReqVO);
+        return success(result, "撤回成功");
+    }
+
+    @PostMapping("/reCommit")
+    @Operation(summary = "驳回或撤回后再次提交用印审批流程信息")
+    @ApiOperationSupport(order = 6)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp:re-commit')")
+    public CommonResult<Long> reCommitOaStamp(@Valid @RequestBody OaStampSaveReqVO reCommitReqVO) {
+        Long result = oaStampService.reCommitOaStamp(reCommitReqVO);
+        return success(result, "再次提交成功");
+    }
+
+    @DeleteMapping("/close")
+    @Operation(summary = "驳回或撤回后关闭用印审批流程信息")
+    @ApiOperationSupport(order = 7)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-entry:close')")
+    public CommonResult<Long> closeOaStamp(@RequestParam("id") Long id) {
+        Long result = oaStampService.closeOaStamp(id);
+
+        return success(result, "关闭成功");
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除用印审批流程信息")
+    @ApiOperationSupport(order = 8)
+    @Parameter(name = "id", description = "编号", required = true)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp:delete')")
+    public CommonResult<Boolean> deleteOaStamp(@RequestParam("id") Long id) {
+        oaStampService.deleteOaStamp(id);
+        return success(true, "删除成功");
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "根据id获得用印审批流程信息")
+    @Parameter(name = "id", description = "编号", required = true, example = "1")
+    @ApiOperationSupport(order = 9)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp:query-id')")
+    public CommonResult<OaStampRespVO> getOaStamp(@RequestParam("id") Long id) {
+        OaStampRespVO respVO = oaStampService.getOaStamp(id);
+        return success(respVO, "查询对象成功");
+    }
+
+    @GetMapping("/getByProcInstId")
+    @Operation(summary = "根据流程实例id获得用印审批流程信息")
+    @Parameter(name = "procInstId", description = "流程实例id", required = true, example = "9528a78d-457e-11ef-853c-4c034fce6445")
+    @ApiOperationSupport(order = 10)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp:query-proc-inst-id')")
+    public CommonResult<OaStampRespVO> getOaStampByProcInstId(@RequestParam("procInstId") String procInstId) {
+        OaStampRespVO respVO = oaStampService.getOaStampByProcInstId(procInstId);
+        return success(respVO, "查询对象成功");
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得用印审批流程信息分页")
+    @ApiOperationSupport(order = 11)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp:query-page')")
+    public CommonResult<PageResult<OaStampRespVO>> getOaStampPage(@Valid @ParameterObject OaStampPageReqVO pageReqVO) {
+        return success(oaStampService.getOaStampPage(pageReqVO), "查询列表成功");
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出用印审批流程信息 Excel")
+    @ApiOperationSupport(order = 12)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportOaStampExcel(@ParameterObject OaStampPageReqVO pageReqVO,
+                                 HttpServletResponse response) throws IOException {
+        PageResult<OaStampRespVO> pageResult = oaStampService.exportOaStampExcel(pageReqVO);
+        List<OaStampRespVO> list = pageResult.getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "用印审批流程信息.xls", "数据", OaStampRespVO.class,
+                BeanUtils.toBean(list, OaStampRespVO.class));
+    }
+}

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

@@ -0,0 +1,45 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.stamp.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+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 OaStampPageReqVO extends PageParam {
+
+    @Schema(description = "用印申请员工姓名", example = "芋艿")
+    private String employeeName;
+
+    @Schema(description = "用印申请员工手机号")
+    private String employeePhone;
+
+    @Schema(description = "部门id", example = "30975")
+    private Long deptId;
+
+    @Schema(description = "员工职位")
+    private String position;
+
+    @Schema(description = "用印标题")
+    private String stampTitle;
+
+    @Schema(description = "审核状态（0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回）", example = "2")
+    private String auditStatus;
+
+    @Schema(description = "申请人员工姓名", example = "张三")
+    private String applyEmployeeName;
+
+    @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/stamp/vo/OaStampRespVO.java

@@ -0,0 +1,119 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.stamp.vo;
+
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
+import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "管理后台 - 用印流程信息 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class OaStampRespVO {
+
+    @Schema(description = "表单主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "18395")
+    @ExcelProperty("表单主键")
+    private Long id;
+
+    @Schema(description = "用印申请人id", example = "7953")
+    @ExcelProperty("用印申请人id")
+    private Long employeeId;
+
+    @Schema(description = "用印申请员工姓名", example = "芋艿")
+    @ExcelProperty("用印申请员工姓名")
+    private String employeeName;
+
+    @Schema(description = "用印申请员工手机号")
+    @ExcelProperty("用印申请员工手机号")
+    private String employeePhone;
+
+    @Schema(description = "用户账号id", example = "24136")
+    @ExcelProperty("用户账号id")
+    private Long userId;
+
+    @Schema(description = "部门id", example = "30975")
+    @ExcelProperty("部门id")
+    private Long deptId;
+
+    @Schema(description = "部门名称")
+    @ExcelProperty("部门名称")
+    private String deptName;
+
+    @Schema(description = "员工职位")
+    @ExcelProperty("员工职位")
+    private String position;
+
+    @Schema(description = "用印标题")
+    @ExcelProperty("用印标题")
+    private String stampTitle;
+
+    @Schema(description = "印章id，多个用逗号分隔", example = "15927")
+    @ExcelProperty("印章id集合")
+    private List<Long> stampSealId;
+
+    @Schema(description = "用印事由", example = "不好")
+    @ExcelProperty("用印事由")
+    private String reason;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remarks;
+
+    @Schema(description = "流程实例id", example = "10738")
+    @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 = "31309")
+    @ExcelProperty("当前审核人员工id")
+    private Long currentAuditEmployeeId;
+
+    @Schema(description = "当前审核人员工姓名", example = "芋艿")
+    @ExcelProperty("当前审核人员工姓名")
+    private String currentAuditEmployeeName;
+
+    @Schema(description = "当前审核人用户id", example = "2555")
+    @ExcelProperty("当前审核人用户id")
+    private Long currentAuditUserId;
+
+    @Schema(description = "最后审核时间")
+    @ExcelProperty("最后审核时间")
+    private LocalDateTime finalAuditDate;
+
+    @Schema(description = "申请人员工id", example = "11188")
+    @ExcelProperty("申请人员工id")
+    private Long applyEmployeeId;
+
+    @Schema(description = "申请人员工姓名", example = "张三")
+    @ExcelProperty("申请人员工姓名")
+    private String applyEmployeeName;
+
+    @Schema(description = "数据来源，0流程添加、1手动添加")
+    @ExcelProperty("数据来源，0流程添加、1手动添加")
+    private String infoSource;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "附件列表")
+    private List<FileDTO> fileList;
+
+    @Schema(description = "审批记录列表")
+    private List<BpmTaskRespVO> auditRecordList;
+
+    @Schema(description = "审批人员列表")
+    private List<AdminUserRespDTO> auditUserList;
+
+    @Schema(description = "当前用户待处理的任务id")
+    private String taskId;
+
+}

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

@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.stamp.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Schema(description = "管理后台 - 用印流程信息新增/修改 Request VO")
+@Data
+public class OaStampSaveReqVO {
+
+    @Schema(description = "表单主键", example = "1")
+    private Long id;
+
+    @Schema(description = "用印标题")
+    @NotBlank(message = "用印标题不能为空")
+    private String stampTitle;
+
+    @Schema(description = "印章id，多个用逗号分隔", example = "[1,2]")
+    @NotEmpty(message = "印章id集合不能为空")
+    private List<Long> stampSealId;
+
+    @Schema(description = "用印事由", example = "用印事由123")
+    private String reason;
+
+    @Schema(description = "备注")
+    private String remarks;
+
+
+    @Schema(description = "发起人自选审批人", example = " [100, 1]")
+    @NotEmpty(message = "发起人自选审批人不能为空")
+    private List<Long> startUserSelectAssignees;
+
+    @Schema(description = "附件主键id", example = "[1, 2]")
+    private List<Long> fileIdList;
+
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/stamp/stampseal/OaStampSealController.java

@@ -0,0 +1,99 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampseal;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampseal.vo.OaStampSealPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampseal.vo.OaStampSealRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampseal.vo.OaStampSealSaveReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.stamp.stampseal.OaStampSealDO;
+import cn.iocoder.yudao.module.bpm.service.stamp.stampseal.OaStampSealService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 用印印章信息")
+@RestController
+@RequestMapping("/bpm/oa-stamp-seal")
+@Validated
+public class OaStampSealController {
+
+    @Resource
+    private OaStampSealService oaStampSealService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建用印印章信息")
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp-seal:create')")
+    public CommonResult<Long> createOaStampSeal(@Valid @RequestBody OaStampSealSaveReqVO createReqVO) {
+        return success(oaStampSealService.createOaStampSeal(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新用印印章信息")
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp-seal:update')")
+    public CommonResult<Boolean> updateOaStampSeal(@Valid @RequestBody OaStampSealSaveReqVO updateReqVO) {
+        oaStampSealService.updateOaStampSeal(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除用印印章信息")
+    @Parameter(name = "id", description = "编号", required = true)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp-seal:delete')")
+    public CommonResult<Boolean> deleteOaStampSeal(@RequestParam("id") Long id) {
+        oaStampSealService.deleteOaStampSeal(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得用印印章信息")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp-seal:query')")
+    public CommonResult<OaStampSealRespVO> getOaStampSeal(@RequestParam("id") Long id) {
+        OaStampSealDO oaStampSeal = oaStampSealService.getOaStampSeal(id);
+        return success(BeanUtils.toBean(oaStampSeal, OaStampSealRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得用印印章信息分页")
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp-seal:query')")
+    public CommonResult<PageResult<OaStampSealRespVO>> getOaStampSealPage(@Valid OaStampSealPageReqVO pageReqVO) {
+        PageResult<OaStampSealDO> pageResult = oaStampSealService.getOaStampSealPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, OaStampSealRespVO.class));
+    }
+    @GetMapping("/list")
+    @Operation(summary = "获得用印印章信息列表")
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp-seal:list')")
+    public CommonResult<List<OaStampSealRespVO>> getOaStampSealList() {
+        List<OaStampSealDO> listResult = oaStampSealService.getOaStampSealList();
+        return success(BeanUtils.toBean(listResult, OaStampSealRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出用印印章信息 Excel")
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-stamp-seal:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportOaStampSealExcel(@Valid OaStampSealPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<OaStampSealDO> list = oaStampSealService.getOaStampSealPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "用印印章信息.xls", "数据", OaStampSealRespVO.class,
+                        BeanUtils.toBean(list, OaStampSealRespVO.class));
+    }
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/stamp/stampseal/vo/OaStampSealPageReqVO.java

@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampseal.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+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 OaStampSealPageReqVO extends PageParam {
+
+    @Schema(description = "uuid", example = "2717")
+    private String sealUuid;
+
+    @Schema(description = "类型：1印章，目前只有印章", example = "2")
+    private String type;
+
+    @Schema(description = "印章名称", example = "李四")
+    private String sealName;
+
+    @Schema(description = "状态，1打开 2关闭", example = "1")
+    private String status;
+
+    @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 remarks;
+
+    @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/stamp/stampseal/vo/OaStampSealRespVO.java

@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampseal.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 用印印章信息 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class OaStampSealRespVO {
+
+    @Schema(description = "主键")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "类型：1印章，目前只有印章")
+    @ExcelProperty("类型：1印章，目前只有印章")
+    private String type;
+
+    @Schema(description = "印章名称", example = "李四")
+    @ExcelProperty("印章名称")
+    private String sealName;
+
+    @Schema(description = "状态，1打开 2关闭")
+    @ExcelProperty("状态，1打开 2关闭")
+    private String status;
+
+    @Schema(description = "有效期起")
+    @ExcelProperty("有效期起")
+    private String startDate;
+
+    @Schema(description = "有效期止")
+    @ExcelProperty("有效期止")
+    private String endDate;
+
+    @Schema(description = "备注")
+    @ExcelProperty("备注")
+    private String remarks;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/stamp/stampseal/vo/OaStampSealSaveReqVO.java

@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampseal.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 用印印章信息新增/修改 Request VO")
+@Data
+public class OaStampSealSaveReqVO {
+
+    @Schema(description = "主键")
+    private Long id;
+
+    @Schema(description = "印章名称", example = "合同专用章")
+    private String sealName;
+
+    @Schema(description = "有效期起")
+    private String startDate;
+
+    @Schema(description = "有效期止")
+    private String endDate;
+
+    @Schema(description = "备注")
+    private String remarks;
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/stamp/OaStampDO.java

@@ -0,0 +1,136 @@
+package cn.iocoder.yudao.module.bpm.dal.dataobject.oa.stamp;
+
+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_stamp")
+@KeySequence("bpm_oa_stamp_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OaStampDO extends BaseDO {
+
+    /**
+     * 表单主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * uuid
+     */
+    private String stampUuid;
+    /**
+     * 用印申请人id
+     */
+    private Long employeeId;
+    /**
+     * 用印申请人uuid
+     */
+    private String employeeUuid;
+    /**
+     * 用印申请员工姓名
+     */
+    private String employeeName;
+    /**
+     * 用印申请员工手机号
+     */
+    private String employeePhone;
+    /**
+     * 用户账号id
+     */
+    private Long userId;
+    /**
+     * 用户账号uuid
+     */
+    private String userUuid;
+    /**
+     * 部门id
+     */
+    private Long deptId;
+    /**
+     * 部门uuid
+     */
+    private String deptUuid;
+    /**
+     * 员工职位
+     */
+    private String position;
+    /**
+     * 用印标题
+     */
+    private String stampTitle;
+    /**
+     * 印章id，多个用逗号分隔
+     */
+    private String stampSealId;
+    /**
+     * 用印事由
+     */
+    private String reason;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 流程实例id
+     */
+    private String procInstId;
+    /**
+     * 审核状态（0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回）
+     */
+    private String auditStatus;
+    /**
+     * 当前审核人员工id
+     */
+    private Long currentAuditEmployeeId;
+    /**
+     * 当前审核人员工uuid
+     */
+    private String currentAuditEmployeeUuid;
+    /**
+     * 当前审核人员工姓名
+     */
+    private String currentAuditEmployeeName;
+    /**
+     * 当前审核人用户id
+     */
+    private Long currentAuditUserId;
+    /**
+     * 当前审核人用户uuid
+     */
+    private String currentAuditUserUuid;
+    /**
+     * 最后审核时间
+     */
+    private LocalDateTime finalAuditDate;
+    /**
+     * 发起人选择的审批人，多个用逗号分隔
+     */
+    private String startUserSelectAssignees;
+    /**
+     * 申请人员工id
+     */
+    private Long applyEmployeeId;
+    /**
+     * 申请人员工姓名
+     */
+    private String applyEmployeeName;
+    /**
+     * 数据来源，0流程添加、1手动添加
+     */
+    private String infoSource;
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/stamp/stampseal/OaStampSealDO.java

@@ -0,0 +1,59 @@
+package cn.iocoder.yudao.module.bpm.dal.dataobject.stamp.stampseal;
+
+import lombok.*;
+import java.util.*;
+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_stamp_seal")
+@KeySequence("bpm_oa_stamp_seal_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OaStampSealDO extends BaseDO {
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * uuid
+     */
+    private String sealUuid;
+    /**
+     * 类型：1印章，目前只有印章
+     */
+    private String type;
+    /**
+     * 印章名称
+     */
+    private String sealName;
+    /**
+     * 状态，1打开 2关闭
+     */
+    private String status;
+    /**
+     * 有效期起
+     */
+    private String startDate;
+    /**
+     * 有效期止
+     */
+    private String endDate;
+    /**
+     * 备注
+     */
+    private String remarks;
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/stamp/OaStampMapper.java

@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.bpm.dal.mysql.oa.stamp;
+
+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.stamp.vo.OaStampPageReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.stamp.OaStampDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用印流程信息 Mapper
+ *
+ * @author dp
+ */
+@Mapper
+public interface OaStampMapper extends BaseMapperX<OaStampDO> {
+
+    default PageResult<OaStampDO> selectPage(OaStampPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<OaStampDO>()
+                .likeIfPresent(OaStampDO::getEmployeeName, reqVO.getEmployeeName())
+                .likeIfPresent(OaStampDO::getEmployeePhone, reqVO.getEmployeePhone())
+                .eqIfPresent(OaStampDO::getDeptId, reqVO.getDeptId())
+                .eqIfPresent(OaStampDO::getPosition, reqVO.getPosition())
+                .likeIfPresent(OaStampDO::getStampTitle, reqVO.getStampTitle())
+                .eqIfPresent(OaStampDO::getAuditStatus, reqVO.getAuditStatus())
+                .likeIfPresent(OaStampDO::getApplyEmployeeName, reqVO.getApplyEmployeeName())
+                .betweenIfPresent(OaStampDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(OaStampDO::getId));
+    }
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/stamp/stampseal/OaStampSealMapper.java

@@ -0,0 +1,31 @@
+package cn.iocoder.yudao.module.bpm.dal.mysql.stamp.stampseal;
+
+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.stamp.stampseal.vo.OaStampSealPageReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.stamp.stampseal.OaStampSealDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用印印章信息 Mapper
+ *
+ * @author dp
+ */
+@Mapper
+public interface OaStampSealMapper extends BaseMapperX<OaStampSealDO> {
+
+    default PageResult<OaStampSealDO> selectPage(OaStampSealPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<OaStampSealDO>()
+                .eqIfPresent(OaStampSealDO::getSealUuid, reqVO.getSealUuid())
+                .eqIfPresent(OaStampSealDO::getType, reqVO.getType())
+                .likeIfPresent(OaStampSealDO::getSealName, reqVO.getSealName())
+                .eqIfPresent(OaStampSealDO::getStatus, reqVO.getStatus())
+                .betweenIfPresent(OaStampSealDO::getStartDate, reqVO.getStartDate())
+                .betweenIfPresent(OaStampSealDO::getEndDate, reqVO.getEndDate())
+                .eqIfPresent(OaStampSealDO::getRemarks, reqVO.getRemarks())
+                .betweenIfPresent(OaStampSealDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(OaStampSealDO::getId));
+    }
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/stamp/OaStampService.java

@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.bpm.service.oa.stamp;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.stamp.vo.OaStampPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.stamp.vo.OaStampRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.stamp.vo.OaStampSaveReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskReturnReqVO;
+
+/**
+ * 用印流程信息 Service 接口
+ *
+ * @author dp
+ */
+public interface OaStampService {
+
+    Long stagingOaStamp(OaStampSaveReqVO stagingReqVO);
+
+    Long commitOaStamp(OaStampSaveReqVO commitReqVO);
+
+    Long agreeOaStamp(BpmTaskApproveReqVO agreeReqVO);
+
+    Long disagreeOaStamp(BpmTaskReturnReqVO disagreeReqVO);
+
+    Long revocationOaStamp(BpmTaskApproveReqVO revocationReqVO);
+
+    Long reCommitOaStamp(OaStampSaveReqVO reCommitReqVO);
+
+    Long closeOaStamp(Long id);
+
+    void deleteOaStamp(Long id);
+
+    OaStampRespVO getOaStamp(Long id);
+
+    OaStampRespVO getOaStampByProcInstId(String procInstId);
+
+    PageResult<OaStampRespVO> getOaStampPage(OaStampPageReqVO pageReqVO);
+
+    PageResult<OaStampRespVO> exportOaStampExcel(OaStampPageReqVO pageReqVO);
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/stamp/OaStampServiceImpl.java

@@ -0,0 +1,675 @@
+package cn.iocoder.yudao.module.bpm.service.oa.stamp;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.stamp.vo.OaStampPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.stamp.vo.OaStampRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.stamp.vo.OaStampSaveReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskReturnReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.stamp.OaStampDO;
+import cn.iocoder.yudao.module.bpm.dal.mysql.oa.stamp.OaStampMapper;
+import cn.iocoder.yudao.module.bpm.enums.DictDataConstants;
+import cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants;
+import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmConstants;
+import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
+import cn.iocoder.yudao.module.infra.api.file.FileApi;
+import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.flowable.engine.TaskService;
+import org.flowable.task.api.Task;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_STAMP_NOT_EXISTS;
+
+/**
+ * 用印流程信息 Service 实现类
+ *
+ * @author dp
+ */
+@Service
+@Validated
+public class OaStampServiceImpl implements OaStampService {
+
+    /**
+     * 对应的流程定义 KEY
+     */
+    public static final String PROCESS_KEY = "oa_stamp";
+
+
+    @Resource
+    private OaStampMapper oaStampMapper;
+
+    @Resource
+    private BpmProcessInstanceApi processInstanceApi;
+
+    @Resource
+    private BpmTaskService bpmTaskService;
+
+    @Resource
+    private TaskService taskService;
+
+    @Resource
+    private FileApi fileApi;
+
+    @Resource
+    private AdminUserApi adminUserApi;
+
+    @Resource
+    private DeptApi deptApi;
+
+    @Override
+    @Transactional
+    public Long stagingOaStamp(OaStampSaveReqVO stagingReqVO) {
+        // 登录人信息
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        AdminUserRespDTO loginUser = adminUserApi.getUser(loginUserId);
+        Objects.requireNonNull(loginUser, "登录用户不能为空");
+        // 人信息
+        AdminUserRespDTO employee = adminUserApi.getUser(loginUserId);
+
+        OaStampDO oaStamp = BeanUtils.toBean(stagingReqVO, OaStampDO.class);
+        if (StringUtils.isBlank(oaStamp.getStampUuid())) {
+            // 创建单据uuid
+            String uuid = IdUtil.fastSimpleUUID();
+            oaStamp.setStampUuid(uuid);
+        }
+        if (employee != null) {
+            oaStamp.setEmployeeId(loginUser.getId());
+            oaStamp.setEmployeeName(loginUser.getNickname());
+            oaStamp.setEmployeePhone(loginUser.getMobile());
+            oaStamp.setDeptId(loginUser.getDeptId());
+            oaStamp.setPosition("员工职位");
+            oaStamp.setUserId(loginUser.getId());
+        }
+        oaStamp.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_STAGING);
+        oaStamp.setInfoSource("0");
+        oaStamp.setApplyEmployeeId(loginUser.getId());
+        oaStamp.setApplyEmployeeName(loginUser.getNickname());
+        List<Long> stampSealId = stagingReqVO.getStampSealId();
+        if (CollectionUtil.isNotEmpty(stampSealId)) {
+            oaStamp.setStampSealId(stampSealId.stream().map(String::valueOf).collect(Collectors.joining(",")));
+        }
+        // 暂存不保存审批人信息
+        oaStamp.setStartUserSelectAssignees(null);
+        // 保存或更新表单信息
+        if (oaStamp.getId() == null) {
+            oaStampMapper.insert(oaStamp);
+        } else {
+            validateOaStampExists(oaStamp.getId());
+            oaStampMapper.updateById(oaStamp);
+        }
+        // 保存业务uuid到附件中
+        saveFileList(stagingReqVO.getFileIdList(), oaStamp.getStampUuid());
+
+        return oaStamp.getId();
+    }
+
+    @Override
+    @Transactional
+    public Long commitOaStamp(OaStampSaveReqVO commitReqVO) {
+        if (CollectionUtil.isEmpty(commitReqVO.getStartUserSelectAssignees())) {
+            throw exception(ErrorCodeConstants.TASK_CREATE_FAIL_NO_START_SELECT_ASSIGNEE);
+        }
+        // 登录人信息
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        AdminUserRespDTO loginUser = adminUserApi.getUser(loginUserId);
+        if (loginUser == null) {
+            throw exception(ErrorCodeConstants.OA_LOGIN_USER_NOT_EXISTS);
+        }
+        // 人信息
+        AdminUserRespDTO employee = adminUserApi.getUser(loginUserId);
+        if (employee == null) {
+            throw exception(ErrorCodeConstants.OA_EMPLOYEE_NOT_EXISTS);
+        }
+
+
+        OaStampDO oaStamp = BeanUtils.toBean(commitReqVO, OaStampDO.class);
+        if (StringUtils.isBlank(oaStamp.getStampUuid())) {
+            // 创建单据uuid
+            String uuid = IdUtil.fastSimpleUUID();
+            oaStamp.setStampUuid(uuid);
+        }
+        oaStamp.setEmployeeId(employee.getId());
+        oaStamp.setEmployeeName(employee.getNickname());
+        oaStamp.setEmployeePhone(employee.getMobile());
+        oaStamp.setDeptId(employee.getDeptId());
+        oaStamp.setPosition("员工职位");
+        oaStamp.setUserId(loginUser.getId());
+        oaStamp.setInfoSource("0");
+        oaStamp.setApplyEmployeeId(loginUser.getId());
+        oaStamp.setApplyEmployeeName(loginUser.getNickname());
+        List<Long> stampSealId = commitReqVO.getStampSealId();
+        if (CollectionUtil.isNotEmpty(stampSealId)) {
+            oaStamp.setStampSealId(stampSealId.stream().map(String::valueOf).collect(Collectors.joining(",")));
+        }
+        // 保存或更新表单信息
+        if (oaStamp.getId() == null) {
+            oaStampMapper.insert(oaStamp);
+        } else {
+            OaStampDO oaStampDO = validateOaStampExists(oaStamp.getId());
+            if (StrUtil.isNotBlank(oaStampDO.getProcInstId())) {
+                throw exception(ErrorCodeConstants.PROCESS_INSTANCE_CREATE_FAIL_HAS_PROCESS);
+            }
+            oaStampMapper.updateById(oaStamp);
+        }
+        // 发起流程
+        Map<String, Object> processInstanceVariables = new HashMap<>();
+        processInstanceVariables.put("auditPass", "true");
+        // 添加审批人信息
+        Map<String, List<Long>> startUserSelectAssignees = new HashMap<>();
+        List<Long> selectAssignees = commitReqVO.getStartUserSelectAssignees();
+        startUserSelectAssignees.put("approver", selectAssignees);
+        String processInstanceId = processInstanceApi
+                .createProcessInstance(loginUser.getId(),
+                        new BpmProcessInstanceCreateReqDTO()
+                                .setProcessDefinitionKey(PROCESS_KEY)
+                                .setVariables(processInstanceVariables)
+                                .setBusinessKey(String.valueOf(oaStamp.getId()))
+                                .setStartUserSelectAssignees(startUserSelectAssignees));
+
+        //获取下一个审批人
+        Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult();
+
+        // 审批同意
+        BpmTaskApproveReqVO agreeReqVO = new BpmTaskApproveReqVO();
+        agreeReqVO.setId(task.getId());
+        agreeReqVO.setReason("[首次提交]");
+        agreeReqVO.setTaskStatus(Integer.valueOf(DictDataConstants.OA_AUDIT_STATUS_COMMITTED));
+        taskService.setVariable(task.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_COMMITTED);
+        taskService.setVariable(task.getId(), "auditPass", "true");
+        bpmTaskService.approveTask(loginUserId, agreeReqVO);
+
+        Task nextTask = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult();
+        if (nextTask == null) {
+            throw exception(ErrorCodeConstants.TASK_CREATE_FAIL_NO_START_SELECT_ASSIGNEE);
+        }
+        Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
+        AdminUserRespDTO currentAuditEmployee = adminUserApi.getUser(currentAuditEmployeeId);
+
+
+        // 将工作流的流程实例ID、单据状态、最后一次审批时间、当前审批人更新到单据信息中
+        oaStampMapper.updateById(new OaStampDO()
+                .setId(oaStamp.getId())
+                .setProcInstId(processInstanceId)
+                .setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_COMMITTED)
+                .setFinalAuditDate(LocalDateTime.now())
+                .setCurrentAuditEmployeeId(currentAuditEmployeeId)
+                .setCurrentAuditEmployeeName(currentAuditEmployee.getNickname())
+                .setStartUserSelectAssignees(selectAssignees.stream().map(String::valueOf).collect(Collectors.joining(","))));
+        // 保存业务uuid到附件中
+        saveFileList(commitReqVO.getFileIdList(), oaStamp.getStampUuid());
+        // TODO DP 发送提交成功站内信
+        return oaStamp.getId();
+    }
+
+    @Override
+    @Transactional
+    public Long agreeOaStamp(BpmTaskApproveReqVO agreeReqVO) {
+        // 登录人信息
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        // TODO DP 根据登录人查询出对应的员工信息
+
+        Task currentTask = bpmTaskService.getTask(agreeReqVO.getId());
+        if (currentTask == null) {
+            throw exception(ErrorCodeConstants.TASK_NOT_EXISTS);
+        }
+        // 先更新为审批中
+        taskService.setVariable(currentTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_AUDITING);
+        LambdaQueryWrapper<OaStampDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(OaStampDO::getProcInstId, currentTask.getProcessInstanceId());
+        OaStampDO oaStamp = oaStampMapper.selectOne(lambdaQueryWrapper);
+        // 如果是最后一个人审批同意，设置流程审批状态为已审核
+        String[] auditPersons = oaStamp.getStartUserSelectAssignees().split(",");
+        String lastAuditPerson = Arrays.stream(auditPersons)
+                .reduce((first, second) -> second)
+                .orElse(null);
+        if (currentTask.getAssignee().equals(lastAuditPerson)) {
+            // 更新为已审核(暂时未生效，未找到原因，先不处理)
+            taskService.setVariable(agreeReqVO.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_AUDITED);
+        }
+        // 审批同意
+        String reason = "[同意]";
+        if (StrUtil.isNotBlank(agreeReqVO.getReason())) {
+            reason = reason + agreeReqVO.getReason();
+        }
+        agreeReqVO.setReason(reason);
+        agreeReqVO.setTaskStatus(Integer.valueOf(DictDataConstants.OA_AUDIT_STATUS_AUDITING));
+        taskService.setVariable(agreeReqVO.getId(), "auditPass", "true");
+        bpmTaskService.approveTask(loginUserId, agreeReqVO);
+
+        Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
+        OaStampDO oaStampDO = new OaStampDO();
+        if (nextTask != null) {
+            Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
+            AdminUserRespDTO currentAuditEmployee = adminUserApi.getUser(currentAuditEmployeeId);
+
+            // 如果审批人重复，实际未结束，再次更新为审核中
+            taskService.setVariable(nextTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_AUDITING);
+            oaStampDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITING)
+                    .setCurrentAuditEmployeeId(currentAuditEmployeeId)
+                    .setCurrentAuditEmployeeName(currentAuditEmployee.getNickname())
+                    .setFinalAuditDate(LocalDateTime.now())
+                    .setId(oaStamp.getId());
+
+        } else {
+            oaStampDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITED)
+                    .setCurrentAuditEmployeeId(null)
+                    .setCurrentAuditEmployeeName(null)
+                    .setFinalAuditDate(LocalDateTime.now())
+                    .setId(oaStamp.getId());
+
+            // TODO 复制业务单据信息到业务模块单据表
+
+        }
+        oaStampMapper.updateById(oaStampDO);
+        // 发送通知
+
+        // 返回
+        return 1L;
+    }
+
+    @Override
+    @Transactional
+    public Long disagreeOaStamp(BpmTaskReturnReqVO disagreeReqVO) {
+        // 登录人信息
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        // TODO DP 根据登录人查询出对应的员工信息
+
+        Task currentTask = bpmTaskService.getTask(disagreeReqVO.getId());
+
+        disagreeReqVO.setTargetTaskDefinitionKey("modifyApply");
+        disagreeReqVO.setReason("[驳回]" + disagreeReqVO.getReason());
+        disagreeReqVO.setTaskStatus(Integer.valueOf(DictDataConstants.OA_AUDIT_STATUS_RETURNED));
+        taskService.setVariable(disagreeReqVO.getId(), "auditPass", "false");
+        taskService.setVariable(disagreeReqVO.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_RETURNED);
+        bpmTaskService.returnTask(loginUserId, disagreeReqVO);
+
+        Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
+        Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
+        AdminUserRespDTO currentAuditEmployee = adminUserApi.getUser(currentAuditEmployeeId);
+
+        // 更新单据状态，当前处理人，最后处理时间
+        LambdaUpdateWrapper<OaStampDO> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(OaStampDO::getCurrentAuditEmployeeId, currentAuditEmployeeId)
+                .set(OaStampDO::getCurrentAuditEmployeeName, currentAuditEmployee.getNickname())
+                .set(OaStampDO::getFinalAuditDate, LocalDateTime.now())
+                .set(OaStampDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_RETURNED)
+                .eq(OaStampDO::getProcInstId, currentTask.getProcessInstanceId());
+        oaStampMapper.update(updateWrapper);
+
+        // 发送通知
+
+        return 1L;
+    }
+
+    @Override
+    @Transactional
+    public Long revocationOaStamp(BpmTaskApproveReqVO revocationReqVO) {
+        // 登录人信息
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        // TODO DP 根据登录人查询出对应的员工信息
+
+        Task currentTask = bpmTaskService.getTask(revocationReqVO.getId());
+        if (currentTask == null) {
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.TASK_NOT_EXISTS);
+        }
+        LambdaQueryWrapper<OaStampDO> lambdaQueryWrapper = new LambdaQueryWrapper<OaStampDO>()
+                .eq(OaStampDO::getProcInstId, currentTask.getProcessInstanceId());
+        OaStampDO oaStampDO = oaStampMapper.selectOne(lambdaQueryWrapper);
+        if (!DictDataConstants.OA_AUDIT_STATUS_COMMITTED.equals(oaStampDO.getAuditStatus())
+                || !Objects.equals(String.valueOf(loginUserId), oaStampDO.getCreator())) {
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.TASK_REVOCATION_NOT_ALLOWED);
+        }
+
+        BpmTaskReturnReqVO returnReqVO = BeanUtils.toBean(revocationReqVO, BpmTaskReturnReqVO.class);
+        returnReqVO.setTargetTaskDefinitionKey("modifyApply");
+        String reason = "[撤回]";
+        if (StrUtil.isNotBlank(returnReqVO.getReason())) {
+            reason = reason + returnReqVO.getReason();
+        }
+        returnReqVO.setReason(reason);
+        returnReqVO.setTaskStatus(Integer.valueOf(DictDataConstants.OA_AUDIT_STATUS_RECALLED));
+        taskService.setVariable(currentTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_RECALLED);
+        bpmTaskService.revocationTask(loginUserId, returnReqVO);
+
+        Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
+        Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
+        AdminUserRespDTO currentAuditEmployee = adminUserApi.getUser(currentAuditEmployeeId);
+
+        // 更新单据状态，当前处理人，最后处理时间
+        LambdaUpdateWrapper<OaStampDO> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(OaStampDO::getCurrentAuditEmployeeId, currentAuditEmployeeId)
+                .set(OaStampDO::getCurrentAuditEmployeeName, currentAuditEmployee.getNickname())
+                .set(OaStampDO::getFinalAuditDate, LocalDateTime.now())
+                .set(OaStampDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_RECALLED)
+                .eq(OaStampDO::getProcInstId, currentTask.getProcessInstanceId());
+        oaStampMapper.update(updateWrapper);
+
+        // 发送通知
+
+        return 1L;
+    }
+
+    @Override
+    @Transactional
+    public Long reCommitOaStamp(OaStampSaveReqVO reCommitReqVO) {
+        if (reCommitReqVO.getId() == null) {
+            throw exception(ErrorCodeConstants.SERVICE_ID_NOT_EXISTS);
+        }
+        // 登录人信息
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        AdminUserRespDTO loginUser = adminUserApi.getUser(loginUserId);
+        if (loginUser == null) {
+            throw exception(ErrorCodeConstants.OA_LOGIN_USER_NOT_EXISTS);
+        }
+        // 人信息
+        AdminUserRespDTO employee = adminUserApi.getUser(loginUserId);
+        if (employee == null) {
+            throw exception(ErrorCodeConstants.OA_EMPLOYEE_NOT_EXISTS);
+        }
+
+        OaStampDO oaStampNew = BeanUtils.toBean(reCommitReqVO, OaStampDO.class);
+        OaStampDO oaStampOld = validateOaStampExists(oaStampNew.getId());
+        oaStampNew.setStampSealId(oaStampOld.getStampUuid())
+                .setProcInstId(oaStampOld.getProcInstId());
+
+        oaStampNew.setEmployeeId(employee.getId());
+        oaStampNew.setEmployeeName(employee.getNickname());
+        oaStampNew.setEmployeePhone(employee.getMobile());
+        oaStampNew.setDeptId(employee.getDeptId());
+        oaStampNew.setPosition("员工职位");
+        oaStampNew.setUserId(loginUser.getId());
+        oaStampNew.setApplyEmployeeId(loginUser.getId());
+        oaStampNew.setApplyEmployeeName(loginUser.getNickname());
+        List<Long> stampSealId = reCommitReqVO.getStampSealId();
+        if (CollectionUtil.isNotEmpty(stampSealId)) {
+            oaStampNew.setStampSealId(stampSealId.stream().map(String::valueOf).collect(Collectors.joining(",")));
+        }
+
+        Task currentTask = taskService.createTaskQuery().processInstanceId(oaStampNew.getProcInstId()).singleResult();
+        BpmTaskApproveReqVO approveReqVO = new BpmTaskApproveReqVO();
+        approveReqVO.setId(currentTask.getId())
+                .setReason("[再次提交]");
+        approveReqVO.setTaskStatus(Integer.valueOf(DictDataConstants.OA_AUDIT_STATUS_COMMITTED));
+        if (CollectionUtil.isNotEmpty(reCommitReqVO.getStartUserSelectAssignees())) {
+            // 添加审批人信息到流程参数中
+            Map<String, List<Long>> startUserSelectAssignees = new HashMap<>();
+            List<Long> selectAssignees = reCommitReqVO.getStartUserSelectAssignees();
+            startUserSelectAssignees.put("approver", selectAssignees);
+            taskService.setVariable(currentTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES, startUserSelectAssignees);
+            // 保存审批人信息
+            oaStampNew.setStartUserSelectAssignees(selectAssignees.stream().map(String::valueOf).collect(Collectors.joining(",")));
+        }
+        taskService.setVariable(currentTask.getId(), "auditPass", "true");
+        taskService.setVariable(currentTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_COMMITTED);
+        // 再次提交，和审批通过逻辑相同
+        bpmTaskService.approveTask(loginUserId, approveReqVO);
+
+        Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
+        Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
+        AdminUserRespDTO currentAuditEmployee = adminUserApi.getUser(currentAuditEmployeeId);
+        oaStampNew.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_COMMITTED)
+                .setCurrentAuditEmployeeId(currentAuditEmployeeId)
+                .setCurrentAuditEmployeeName(currentAuditEmployee.getNickname())
+                .setFinalAuditDate(LocalDateTime.now());
+        oaStampMapper.updateById(oaStampNew);
+
+        // 保存业务uuid到附件中
+        saveFileList(reCommitReqVO.getFileIdList(), oaStampNew.getStampUuid());
+
+        return 1L;
+    }
+
+    @Override
+    @Transactional
+    public Long closeOaStamp(Long id) {
+        if (id == null) {
+            throw exception(ErrorCodeConstants.SERVICE_ID_NOT_EXISTS);
+        }
+        // 登录人信息
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        // TODO DP 根据登录人查询出对应的员工信息
+
+        OaStampDO oaStampDO = oaStampMapper.selectById(id);
+        if (!DictDataConstants.OA_AUDIT_STATUS_RETURNED.equals(oaStampDO.getAuditStatus())
+                && !DictDataConstants.OA_AUDIT_STATUS_RECALLED.equals(oaStampDO.getAuditStatus())) {
+            throw exception(ErrorCodeConstants.TASK_CLOSE_NOT_ALLOWED);
+        }
+
+        Task currentTask = taskService.createTaskQuery().processInstanceId(oaStampDO.getProcInstId()).singleResult();
+        BpmTaskApproveReqVO approveReqVO = new BpmTaskApproveReqVO();
+        approveReqVO.setId(currentTask.getId())
+                .setReason("[关闭]");
+        approveReqVO.setTaskStatus(Integer.valueOf(DictDataConstants.OA_AUDIT_STATUS_CLOSED));
+        taskService.setVariable(currentTask.getId(), "auditPass", "false");
+        taskService.setVariable(currentTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_CLOSED);
+        // 关闭，使用审批通过的方法实现
+        bpmTaskService.approveTask(loginUserId, approveReqVO);
+
+        LambdaUpdateWrapper<OaStampDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        lambdaUpdateWrapper.set(OaStampDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_CLOSED)
+                .set(OaStampDO::getCurrentAuditEmployeeId, null)
+                .set(OaStampDO::getCurrentAuditEmployeeName, null)
+                .set(OaStampDO::getFinalAuditDate, LocalDateTime.now())
+                .eq(OaStampDO::getId, id);
+        oaStampMapper.update(lambdaUpdateWrapper);
+        return 1L;
+    }
+
+    @Override
+    public void deleteOaStamp(Long id) {
+        // 校验存在
+        validateOaStampDelete(id);
+        // 删除
+        oaStampMapper.deleteById(id);
+    }
+
+    @Override
+    public OaStampRespVO getOaStamp(Long id) {
+        // 登录人信息
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        // TODO DP 根据登录人查询出对应的员工信息
+
+        OaStampDO oaStampDO = validateOaStampExists(id);
+        OaStampRespVO oaStampRespVO = BeanUtils.toBean(oaStampDO, OaStampRespVO.class);
+        if (oaStampDO.getDeptId() != null) {
+            DeptRespDTO dept = deptApi.getDept(oaStampDO.getDeptId());
+            if (dept != null) {
+                oaStampRespVO.setDeptName(dept.getName());
+            }
+        }
+
+        // 印章列表
+        String stampSealId = oaStampDO.getStampSealId();
+        if (StrUtil.isNotBlank(stampSealId)) {
+            String[] stampSealIdArray = stampSealId.split(",");
+            List<Long> stampSealIdList = Arrays.stream(stampSealIdArray).map(Long::valueOf).collect(Collectors.toList());
+            oaStampRespVO.setStampSealId(stampSealIdList);
+        }
+
+        String procInstId = oaStampDO.getProcInstId();
+        if (StrUtil.isNotBlank(procInstId)) {
+            Task task = taskService.createTaskQuery()
+                    .processInstanceId(procInstId)
+                    .taskAssignee(String.valueOf(loginUserId))
+                    .singleResult();
+            if (DictDataConstants.OA_AUDIT_STATUS_COMMITTED.equals(oaStampDO.getAuditStatus())) {
+                // 如果是已提交，不限制任务处理人是当前登录人，用于直接撤回
+                task = taskService.createTaskQuery()
+                        .processInstanceId(procInstId)
+                        .singleResult();
+            }
+            if (task != null) {
+                oaStampRespVO.setTaskId(task.getId());
+            }
+        }
+
+        // 附件列表
+        List<FileDTO> fileList = fileApi.getFileDTOListByBiz(oaStampDO.getStampUuid());
+        oaStampRespVO.setFileList(fileList);
+
+        // 审批记录
+        if (StrUtil.isNotBlank(oaStampDO.getProcInstId())) {
+            List<BpmTaskRespVO> auditRecordList = bpmTaskService.getAuditRecordListByProcessInstanceId(oaStampDO.getProcInstId());
+            oaStampRespVO.setAuditRecordList(auditRecordList);
+        }
+
+        // 审批人
+        String startUserSelectAssignees = oaStampDO.getStartUserSelectAssignees();
+        if (StrUtil.isNotEmpty(startUserSelectAssignees)) {
+            List<Long> userIdList = Arrays.stream(startUserSelectAssignees.split(","))
+                    .map(Long::valueOf).collect(Collectors.toList());
+            List<AdminUserRespDTO> userList = adminUserApi.getUserList(userIdList);
+            List<AdminUserRespDTO> auditUserList = new ArrayList<>();
+            for (Long userId : userIdList) {
+                for (AdminUserRespDTO adminUserRespDTO : userList) {
+                    if (Objects.equals(userId, adminUserRespDTO.getId())) {
+                        auditUserList.add(adminUserRespDTO);
+                        break;
+                    }
+                }
+            }
+            oaStampRespVO.setAuditUserList(auditUserList);
+        }
+
+        return oaStampRespVO;
+    }
+
+    @Override
+    public OaStampRespVO getOaStampByProcInstId(String procInstId) {
+        OaStampDO oaStampDO = oaStampMapper.selectOne(OaStampDO::getProcInstId, procInstId);
+        OaStampRespVO oaStampRespVO = BeanUtils.toBean(oaStampDO, OaStampRespVO.class);
+        if (oaStampDO.getDeptId() != null) {
+            DeptRespDTO dept = deptApi.getDept(oaStampDO.getDeptId());
+            if (dept != null) {
+                oaStampRespVO.setDeptName(dept.getName());
+            }
+        }
+
+        // 印章列表
+        String stampSealId = oaStampDO.getStampSealId();
+        if (StrUtil.isNotBlank(stampSealId)) {
+            String[] stampSealIdArray = stampSealId.split(",");
+            List<Long> stampSealIdList = Arrays.stream(stampSealIdArray).map(Long::valueOf).collect(Collectors.toList());
+            oaStampRespVO.setStampSealId(stampSealIdList);
+        }
+
+        // 附件列表
+        List<FileDTO> fileList = fileApi.getFileDTOListByBiz(oaStampDO.getStampUuid());
+        oaStampRespVO.setFileList(fileList);
+
+        // 审批记录
+        if (StrUtil.isNotBlank(oaStampDO.getProcInstId())) {
+            List<BpmTaskRespVO> auditRecordList = bpmTaskService.getAuditRecordListByProcessInstanceId(oaStampDO.getProcInstId());
+            oaStampRespVO.setAuditRecordList(auditRecordList);
+        }
+
+        // 审批人
+        String startUserSelectAssignees = oaStampDO.getStartUserSelectAssignees();
+        if (StrUtil.isNotEmpty(startUserSelectAssignees)) {
+            List<Long> userIdList = Arrays.stream(startUserSelectAssignees.split(","))
+                    .map(Long::valueOf).collect(Collectors.toList());
+            List<AdminUserRespDTO> userList = adminUserApi.getUserList(userIdList);
+            List<AdminUserRespDTO> auditUserList = new ArrayList<>();
+            for (Long userId : userIdList) {
+                for (AdminUserRespDTO adminUserRespDTO : userList) {
+                    if (Objects.equals(userId, adminUserRespDTO.getId())) {
+                        auditUserList.add(adminUserRespDTO);
+                        break;
+                    }
+                }
+            }
+            oaStampRespVO.setAuditUserList(auditUserList);
+        }
+
+        return oaStampRespVO;
+    }
+
+    @Override
+    public PageResult<OaStampRespVO> getOaStampPage(OaStampPageReqVO pageReqVO) {
+        PageResult<OaStampDO> oaStampDOPageResult = oaStampMapper.selectPage(pageReqVO);
+        PageResult<OaStampRespVO> oaStampRespVOPageResult = BeanUtils.toBean(oaStampDOPageResult, OaStampRespVO.class);
+
+        List<OaStampRespVO> oaStampRespVOList = oaStampRespVOPageResult.getList();
+        if (CollectionUtil.isNotEmpty(oaStampRespVOList)) {
+            List<Long> employeeIdList = oaStampRespVOList.stream().map(OaStampRespVO::getCurrentAuditEmployeeId).collect(Collectors.toList());
+            List<AdminUserRespDTO> employeeList = adminUserApi.getUserList(employeeIdList);
+            for (OaStampRespVO respVO : oaStampRespVOList) {
+                for (AdminUserRespDTO employee : employeeList) {
+                    if (employee.getId() != null && employee.getId().equals(respVO.getCurrentAuditEmployeeId())) {
+                        respVO.setCurrentAuditEmployeeName(employee.getNickname());
+                        break;
+                    }
+                }
+            }
+
+            List<Long> deptIdList = oaStampRespVOList.stream().map(OaStampRespVO::getDeptId).collect(Collectors.toList());
+            List<DeptRespDTO> deptList = deptApi.getDeptList(deptIdList);
+            for (OaStampRespVO respVO : oaStampRespVOList) {
+                for (DeptRespDTO dept : deptList) {
+                    if (dept.getId() != null && dept.getId().equals(respVO.getDeptId())) {
+                        respVO.setDeptName(dept.getName());
+                        break;
+                    }
+                }
+            }
+        }
+
+        return oaStampRespVOPageResult;
+    }
+
+    @Override
+    public PageResult<OaStampRespVO> exportOaStampExcel(OaStampPageReqVO pageReqVO) {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        return getOaStampPage(pageReqVO);
+    }
+
+    private void validateOaStampDelete(Long id) {
+        OaStampDO oaStampDO = validateOaStampExists(id);
+        if (!DictDataConstants.OA_AUDIT_STATUS_STAGING.equals(oaStampDO.getAuditStatus())) {
+            throw exception(ErrorCodeConstants.DELETE_FAIL_NOT_STAGING);
+        }
+    }
+
+    private OaStampDO validateOaStampExists(Long id) {
+        OaStampDO oaStampDO = oaStampMapper.selectById(id);
+        if (oaStampDO == null) {
+            throw exception(OA_STAMP_NOT_EXISTS);
+        }
+        return oaStampDO;
+    }
+
+    /**
+     * 保存业务uuid到附件中
+     */
+    private void saveFileList(List<Long> fileIdList, String serviceId) {
+        if (CollectionUtil.isNotEmpty(fileIdList) && StrUtil.isNotEmpty(serviceId)) {
+            fileApi.updateFileBiz(fileIdList, serviceId);
+        }
+    }
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/stamp/stampseal/OaStampSealService.java

@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.module.bpm.service.stamp.stampseal;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampseal.vo.OaStampSealPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampseal.vo.OaStampSealSaveReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.stamp.stampseal.OaStampSealDO;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 用印印章信息 Service 接口
+ *
+ * @author dp
+ */
+public interface OaStampSealService {
+
+    /**
+     * 创建用印印章信息
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createOaStampSeal(@Valid OaStampSealSaveReqVO createReqVO);
+
+    /**
+     * 更新用印印章信息
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateOaStampSeal(@Valid OaStampSealSaveReqVO updateReqVO);
+
+    /**
+     * 删除用印印章信息
+     *
+     * @param id 编号
+     */
+    void deleteOaStampSeal(Long id);
+
+    /**
+     * 获得用印印章信息
+     *
+     * @param id 编号
+     * @return 用印印章信息
+     */
+    OaStampSealDO getOaStampSeal(Long id);
+
+    /**
+     * 获得用印印章信息分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 用印印章信息分页
+     */
+    PageResult<OaStampSealDO> getOaStampSealPage(OaStampSealPageReqVO pageReqVO);
+
+    List<OaStampSealDO> getOaStampSealList();
+
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/stamp/stampseal/OaStampSealServiceImpl.java

@@ -0,0 +1,84 @@
+package cn.iocoder.yudao.module.bpm.service.stamp.stampseal;
+
+import cn.hutool.core.util.IdUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampseal.vo.OaStampSealPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampseal.vo.OaStampSealSaveReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.stamp.stampseal.OaStampSealDO;
+import cn.iocoder.yudao.module.bpm.dal.mysql.stamp.stampseal.OaStampSealMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_STAMP_SEAL_NOT_EXISTS;
+
+/**
+ * 用印印章信息 Service 实现类
+ *
+ * @author dp
+ */
+@Service
+@Validated
+public class OaStampSealServiceImpl implements OaStampSealService {
+
+    @Resource
+    private OaStampSealMapper oaStampSealMapper;
+
+    @Override
+    public Long createOaStampSeal(OaStampSealSaveReqVO createReqVO) {
+        // 插入
+        OaStampSealDO oaStampSeal = BeanUtils.toBean(createReqVO, OaStampSealDO.class);
+        oaStampSeal.setSealUuid(IdUtil.fastSimpleUUID());
+        oaStampSealMapper.insert(oaStampSeal);
+        // 返回
+        return oaStampSeal.getId();
+    }
+
+    @Override
+    public void updateOaStampSeal(OaStampSealSaveReqVO updateReqVO) {
+        // 校验存在
+        validateOaStampSealExists(updateReqVO.getId());
+        // 更新
+        OaStampSealDO updateObj = BeanUtils.toBean(updateReqVO, OaStampSealDO.class);
+        oaStampSealMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteOaStampSeal(Long id) {
+        // 校验存在
+        validateOaStampSealExists(id);
+        // 删除
+        oaStampSealMapper.deleteById(id);
+    }
+
+    private void validateOaStampSealExists(Long id) {
+        if (oaStampSealMapper.selectById(id) == null) {
+            throw exception(OA_STAMP_SEAL_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public OaStampSealDO getOaStampSeal(Long id) {
+        return oaStampSealMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<OaStampSealDO> getOaStampSealPage(OaStampSealPageReqVO pageReqVO) {
+        return oaStampSealMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<OaStampSealDO> getOaStampSealList() {
+        LambdaQueryWrapper<OaStampSealDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper
+                .eq(OaStampSealDO::getStatus, "1") // 开启的
+                .orderByAsc(OaStampSealDO::getId);
+        return oaStampSealMapper.selectList(lambdaQueryWrapper);
+    }
+
+}

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

@@ -1,6 +1,6 @@
 <?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 namespace="cn.iocoder.yudao.module.bpm.dal.mysql.oa.leave.OaLeaveMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

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

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

yudao-module-finance/yudao-module-expense-biz/src/main/java/cn/iocoder/yudao/module/expense/service/expensetype/ExpenseTypeServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -100,6 +101,10 @@ public class ExpenseTypeServiceImpl implements ExpenseTypeService {
 
     @Override
     public List<ExpenseItemDO> getItemListByExpenseTypeId(Long expenseTypeId) {
+        if (expenseTypeId != null && expenseTypeId == 0L) {
+            // 约定：前端传0，表示未选择报销类型，此时费用项目返回空集合
+            return new ArrayList<>();
+        }
         return itemMapper.selectListByExpenseTypeId(expenseTypeId);
     }