1、离职审批接口

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

@@ -100,7 +100,7 @@ public interface ErrorCodeConstants {
     // ========== 合同续签流程信息 1-009_017_003 ==========
     ErrorCode OA_RENEW_NOT_EXISTS = new ErrorCode(1009017003, "合同续签流程信息不存在");
     // ========== 离职流程信息 1-009_017_004 ==========
-    ErrorCode OA_DIMISSION_NOT_EXISTS = new ErrorCode(1009017004, "离职流程信息不存在");
+    ErrorCode OA_TURNOVER_NOT_EXISTS = new ErrorCode(1_009_017_004, "离职流程信息不存在");
     // ========== 请假流程信息 1-009_017_005 ==========
     ErrorCode OA_HOLIDAY_NOT_EXISTS = new ErrorCode(1009017005, "请假流程信息不存在");
     // ========== 通用事项审批流程信息 1-009_017_006 ==========

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

@@ -1,12 +1,11 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.oa.renew.vo;
 
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Schema(description = "管理后台 - 合同续签流程信息新增/修改 Request VO")
@@ -43,6 +42,7 @@ public class OaRenewSaveReqVO {
     private String remarks;
 
     @Schema(description = "发起人自选审批人id集合", example = " [100, 1]")
+    @NotEmpty(message = "发起人自选审批人集合不能为空")
     private List<Long> startUserSelectAssignees;
 
     @Schema(description = "附件主键id集合", example = "[1, 2]")

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/turnover/OaTurnoverController.java

@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover;
 
 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;
@@ -10,12 +9,13 @@ import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverPag
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverRespVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverSaveReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.turnover.OaTurnoverDO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskReturnReqVO;
 import cn.iocoder.yudao.module.bpm.service.oa.turnover.OaTurnoverService;
+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.springframework.security.access.prepost.PreAuthorize;
+import org.springdoc.api.annotations.ParameterObject;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,7 +27,6 @@ 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;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "管理后台 - 离职流程信息")
 @RestController
@@ -38,88 +37,120 @@ public class OaTurnoverController {
     @Resource
     private OaTurnoverService oaTurnoverService;
 
-
-    @PostMapping("/start")
-    @Operation(summary = "提交或暂存离职流程信息")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-Turnover:start')")
-    public CommonResult<Long> startOaTurnover(@Valid @RequestBody OaTurnoverSaveReqVO createReqVO) {
-        return success(oaTurnoverService.startOaTurnover(getLoginUserId(), createReqVO));
+    @PostMapping("/staging")
+    @Operation(summary = "暂存续签审批流程信息")
+    @ApiOperationSupport(order = 1)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-turnover:staging')")
+    public CommonResult<Long> stagingOaTurnover(@RequestBody OaTurnoverSaveReqVO stagingReqVO) {
+        Long oaTurnoverId = oaTurnoverService.stagingOaTurnover(stagingReqVO);
+        return success(oaTurnoverId, "暂存成功");
     }
 
-    @PostMapping("/completeTure")
-    @Operation(summary = "审批同意离职流程信息")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:complete-true')")
-    public CommonResult<Long> completeTrueOaTurnover(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
-        return success(oaTurnoverService.completeTrueOaTurnover(getLoginUserId(), reqVO));
+    @PostMapping("/commit")
+    @Operation(summary = "提交续签审批流程信息")
+    @ApiOperationSupport(order = 2)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-turnover:commit')")
+    public CommonResult<Long> commitOaTurnover(@Valid @RequestBody OaTurnoverSaveReqVO commitReqVO) {
+        Long oaTurnoverId = oaTurnoverService.commitOaTurnover(commitReqVO);
+        return success(oaTurnoverId, "提交成功");
     }
 
-    @PostMapping("/completeFalse")
-    @Operation(summary = "驳回或撤回离职流程信息")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:complete-false')")
-    public CommonResult<Long> completeFalseOaTurnover(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
-        return success(oaTurnoverService.completeFalseOaTurnover(getLoginUserId(), reqVO));
+    @PostMapping("/agree")
+    @Operation(summary = "审批同意续签审批流程信息")
+    @ApiOperationSupport(order = 3)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-turnover:agree')")
+    public CommonResult<Long> agreeOaTurnover(@Valid @RequestBody BpmTaskApproveReqVO agreeReqVO) {
+        Long result = oaTurnoverService.agreeOaTurnover(agreeReqVO);
+        return success(result, "审批成功");
     }
 
-    @PostMapping("/updateComplete")
-    @Operation(summary = "驳回和撤回后再次提交或关闭离职流程信息")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:update-complete')")
-    public CommonResult<Long> updateCompleteOaTurnover(@Valid @RequestBody OaTurnoverSaveReqVO createReqVO) {
-        return success(oaTurnoverService.updateCompleteOaTurnover(getLoginUserId(), createReqVO, createReqVO.getBpmTaskApproveReqVO()));
+    @PostMapping("/disagree")
+    @Operation(summary = "驳回续签审批流程信息")
+    @ApiOperationSupport(order = 4)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-turnover:disagree')")
+    public CommonResult<Long> disagreeOaTurnover(@Valid @RequestBody BpmTaskReturnReqVO disagreeReqVO) {
+        Long result = oaTurnoverService.disagreeOaTurnover(disagreeReqVO);
+        return success(result, "驳回成功");
     }
 
+    @PostMapping("/revocation")
+    @Operation(summary = "撤回续签审批流程信息")
+    @ApiOperationSupport(order = 5)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-turnover:revocation')")
+    public CommonResult<Long> revocationOaTurnover(@Valid @RequestBody BpmTaskApproveReqVO revocationReqVO) {
+        Long result = oaTurnoverService.revocationOaTurnover(revocationReqVO);
+        return success(result, "撤回成功");
+    }
 
-    @PostMapping("/create")
-    @Operation(summary = "创建离职流程信息")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-dimission:create')")
-    public CommonResult<Long> createOaTurnover(@Valid @RequestBody OaTurnoverSaveReqVO createReqVO) {
-        return success(oaTurnoverService.createOaTurnover(createReqVO));
+    @PostMapping("/reCommit")
+    @Operation(summary = "驳回或撤回后再次提交续签审批流程信息")
+    @ApiOperationSupport(order = 6)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-turnover:re-commit')")
+    public CommonResult<Long> reCommitOaTurnover(@Valid @RequestBody OaTurnoverSaveReqVO reCommitReqVO) {
+        Long result = oaTurnoverService.reCommitOaTurnover(reCommitReqVO);
+        return success(result, "再次提交成功");
     }
 
-    @PutMapping("/update")
-    @Operation(summary = "更新离职流程信息")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-dimission:update')")
-    public CommonResult<Boolean> updateOaTurnover(@Valid @RequestBody OaTurnoverSaveReqVO updateReqVO) {
-        oaTurnoverService.updateOaTurnover(updateReqVO);
-        return success(true);
+    @DeleteMapping("/close")
+    @Operation(summary = "驳回或撤回后关闭续签审批流程信息")
+    @ApiOperationSupport(order = 7)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-entry:close')")
+    public CommonResult<Long> closeOaTurnover(@RequestParam("id") Long id) {
+        Long result = oaTurnoverService.closeOaTurnover(id);
+
+        return success(result, "关闭成功");
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除离职流程信息")
+    @Operation(summary = "删除续签审批流程信息")
+    @ApiOperationSupport(order = 8)
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('bpm:oa-dimission:delete')")
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-turnover:delete')")
     public CommonResult<Boolean> deleteOaTurnover(@RequestParam("id") Long id) {
         oaTurnoverService.deleteOaTurnover(id);
-        return success(true);
+        return success(true, "删除成功");
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得离职流程信息")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-dimission:query')")
+    @Operation(summary = "根据id获得续签审批流程信息")
+    @Parameter(name = "id", description = "编号", required = true, example = "1")
+    @ApiOperationSupport(order = 9)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-turnover:query-id')")
     public CommonResult<OaTurnoverRespVO> getOaTurnover(@RequestParam("id") Long id) {
-        OaTurnoverDO oaTurnover = oaTurnoverService.getOaTurnover(id);
-        return success(BeanUtils.toBean(oaTurnover, OaTurnoverRespVO.class));
+        OaTurnoverRespVO respVO = oaTurnoverService.getOaTurnover(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-turnover:query-proc-inst-id')")
+    public CommonResult<OaTurnoverRespVO> getOaTurnoverByProcInstId(@RequestParam("procInstId") String procInstId) {
+        OaTurnoverRespVO respVO = oaTurnoverService.getOaTurnoverByProcInstId(procInstId);
+        return success(respVO, "查询对象成功");
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得离职流程信息分页")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-dimission:query')")
-    public CommonResult<PageResult<OaTurnoverRespVO>> getOaTurnoverPage(@Valid OaTurnoverPageReqVO pageReqVO) {
-        PageResult<OaTurnoverDO> pageResult = oaTurnoverService.getOaTurnoverPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, OaTurnoverRespVO.class));
+    @Operation(summary = "获得续签审批流程信息分页")
+    @ApiOperationSupport(order = 11)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-turnover:query-page')")
+    public CommonResult<PageResult<OaTurnoverRespVO>> getOaTurnoverPage(@Valid @ParameterObject OaTurnoverPageReqVO pageReqVO) {
+        return success(oaTurnoverService.getOaTurnoverPage(pageReqVO), "查询列表成功");
     }
 
     @GetMapping("/export-excel")
-    @Operation(summary = "导出离职流程信息 Excel")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-dimission:export')")
+    @Operation(summary = "导出续签审批流程信息 Excel")
+    @ApiOperationSupport(order = 12)
+    // @PreAuthorize("@ss.hasPermission('bpm:oa-turnover:export')")
     @ApiAccessLog(operateType = EXPORT)
-    public void exportOaTurnoverExcel(@Valid OaTurnoverPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<OaTurnoverDO> list = oaTurnoverService.getOaTurnoverPage(pageReqVO).getList();
+    public void exportOaTurnoverExcel(@ParameterObject OaTurnoverPageReqVO pageReqVO,
+                                   HttpServletResponse response) throws IOException {
+        PageResult<OaTurnoverRespVO> pageResult = oaTurnoverService.exportOaTurnoverExcel(pageReqVO);
+        List<OaTurnoverRespVO> list = pageResult.getList();
         // 导出 Excel
-        ExcelUtils.write(response, "离职流程信息.xls", "数据", OaTurnoverRespVO.class,
-                        BeanUtils.toBean(list, OaTurnoverRespVO.class));
+        ExcelUtils.write(response, "续签审批流程信息.xls", "数据", OaTurnoverRespVO.class,
+                BeanUtils.toBean(list, OaTurnoverRespVO.class));
     }
 
 }

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

@@ -14,73 +14,29 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class OaTurnoverPageReqVO extends PageParam {
 
-    @Schema(description = "uuid", example = "18425")
-    private String turnoverId;
-
-    @Schema(description = "转正人id", example = "18376")
-    private Long employeeId;
-
-    @Schema(description = "转正人uuid", example = "2649")
-    private String employeeUuid;
-
-    @Schema(description = "转正员工姓名", example = "赵六")
+    @Schema(description = "离职员工姓名", example = "赵六")
     private String employeeName;
 
-    @Schema(description = "用户账号id", example = "9650")
-    private Long userId;
-
-    @Schema(description = "用户账号uuid", example = "4544")
-    private String userUuid;
+    @Schema(description = "续签员工手机号", example = "1394920000")
+    private String employeePhone;
 
     @Schema(description = "部门id", example = "24445")
     private Long deptId;
 
-    @Schema(description = "部门uuid", example = "29090")
-    private String deptUuid;
-
     @Schema(description = "职位")
     private String position;
 
-    @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[] turnoverDate;
 
-    @Schema(description = "离职原因", example = "不喜欢")
-    private String turnoverReason;
-
-    @Schema(description = "备注")
-    private String remarks;
-
-    @Schema(description = "流程实例id", example = "18482")
-    private String procInstId;
-
     @Schema(description = "审核状态（0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回）", example = "2")
     private String auditStatus;
 
-    @Schema(description = "当前审核人用户id", example = "12344")
-    private Long currentAuditUserId;
-
-    @Schema(description = "当前审核人用户uuid", example = "27993")
-    private String currentAuditUserUuid;
-
-    @Schema(description = "当前审核人员工id", example = "31626")
-    private Long currentAuditEmployeeId;
-
-    @Schema(description = "当前审核人员工uuid", example = "6500")
-    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 = "申请人")
+    private String applyEmployeeName;
 
-    @Schema(description = "创建时间")
+    @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/turnover/vo/OaTurnoverRespVO.java

@@ -1,9 +1,14 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.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 io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.time.LocalDateTime;
+import java.util.List;
+
 import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 离职流程信息 Response VO")
@@ -47,13 +52,17 @@ public class OaTurnoverRespVO {
     @ExcelProperty("部门uuid")
     private String deptUuid;
 
+    @Schema(description = "部门名称")
+    @ExcelProperty("部门名称")
+    private String deptName;
+
     @Schema(description = "职位")
     @ExcelProperty("职位")
     private String position;
 
     @Schema(description = "入职日期")
     @ExcelProperty("入职日期")
-    private String startDate;
+    private String entryDate;
 
     @Schema(description = "离职日期")
     @ExcelProperty("离职日期")
@@ -91,16 +100,36 @@ public class OaTurnoverRespVO {
     @ExcelProperty("当前审核人员工uuid")
     private String currentAuditEmployeeUuid;
 
+    @Schema(description = "当前审核人员工姓名")
+    @ExcelProperty("当前审核人员工姓名")
+    private String currentAuditEmployeeName;
+
     @Schema(description = "最后审核时间")
     @ExcelProperty("最后审核时间")
     private LocalDateTime finalAuditDate;
 
-    @Schema(description = "数据来源，0流程添加、1手动添加")
-    @ExcelProperty("数据来源，0流程添加、1手动添加")
-    private String infoSource;
-
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "申请人id")
+    @ExcelProperty("申请人id")
+    private Long applyEmployeeId;
+
+    @Schema(description = "申请人姓名")
+    @ExcelProperty("申请人姓名")
+    private String applyEmployeeName;
+
+    @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/turnover/vo/OaTurnoverSaveReqVO.java

@@ -3,6 +3,10 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.*;
 import java.time.LocalDateTime;
 
@@ -10,83 +14,29 @@ import java.time.LocalDateTime;
 @Data
 public class OaTurnoverSaveReqVO {
 
-    @Schema(description = "离职表单主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15606")
+    @Schema(description = "离职表单主键",example = "1")
     private Long id;
 
-    @Schema(description = "uuid", example = "18425")
-    private String turnoverId;
-
-    @Schema(description = "转正人id", example = "18376")
+    @Schema(description = "离职人id", example = "1")
+    @NotNull(message = "离职人不能为空")
     private Long employeeId;
 
-    @Schema(description = "转正人uuid", example = "2649")
-    private String employeeUuid;
-
-    @Schema(description = "转正员工姓名", example = "赵六")
-    private String employeeName;
-
-    @Schema(description = "用户账号id", example = "9650")
-    private Long userId;
-
-    @Schema(description = "用户账号uuid", example = "4544")
-    private String userUuid;
-
-    @Schema(description = "部门id", example = "24445")
-    private Long deptId;
-
-    @Schema(description = "部门uuid", example = "29090")
-    private String deptUuid;
-
-    @Schema(description = "职位")
-    private String position;
-
-    @Schema(description = "入职日期")
-    private String startDate;
-
     @Schema(description = "离职日期")
+    @NotBlank(message = "离职日期不能为空")
     private String turnoverDate;
 
-    @Schema(description = "离职原因", example = "不喜欢")
+    @Schema(description = "离职原因", example = "职业规划")
+    @NotBlank(message = "离职原因不能为空")
     private String turnoverReason;
 
     @Schema(description = "备注")
     private String remarks;
 
-    @Schema(description = "流程实例id", example = "18482")
-    private String procInstId;
-
-    @Schema(description = "审核状态（0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回）", example = "2")
-    private String auditStatus;
-
-    @Schema(description = "当前审核人用户id", example = "12344")
-    private Long currentAuditUserId;
-
-    @Schema(description = "当前审核人用户uuid", example = "27993")
-    private String currentAuditUserUuid;
-
-    @Schema(description = "当前审核人员工id", example = "31626")
-    private Long currentAuditEmployeeId;
-
-    @Schema(description = "当前审核人员工uuid", example = "6500")
-    private String currentAuditEmployeeUuid;
-
-    @Schema(description = "最后审核时间")
-    private LocalDateTime finalAuditDate;
-
-    @Schema(description = "数据来源，0流程添加、1手动添加")
-    private String infoSource;
-
-    @Schema(description = "审批，true 通过，false 驳回", example = "true")
-    private Boolean auditPass;
-
-    @Schema(description = "发起人自选审批人 Map", example = " [1, 1]")
+    @Schema(description = "发起人自选审批人", example = " [100, 1]")
+    @NotEmpty(message = "发起人自选审批人不能为空")
     private List<Long> startUserSelectAssignees;
 
     @Schema(description = "附件主键id", example = "[1, 2]")
     private List<Long> fileIdList;
 
-    @Schema(description = "审批信息")
-    private BpmTaskApproveReqVO bpmTaskApproveReqVO;
-
-
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/turnover/OaTurnoverDO.java

@@ -44,6 +44,10 @@ public class OaTurnoverDO extends BaseDO {
      * 转正员工姓名
      */
     private String employeeName;
+    /**
+     * 离职员工手机号
+     */
+    private String employeePhone;
     /**
      * 用户账号id
      */
@@ -67,7 +71,7 @@ public class OaTurnoverDO extends BaseDO {
     /**
      * 入职日期
      */
-    private String startDate;
+    private String entryDate;
     /**
      * 离职日期
      */
@@ -88,6 +92,10 @@ public class OaTurnoverDO extends BaseDO {
      * 审核状态（0暂存、1已提交、2审核中、3已审核、4已关闭、5已驳回）
      */
     private String auditStatus;
+    /**
+     * 数据来源，0流程添加、1手动添加
+     */
+    private String infoSource;
     /**
      * 当前审核人用户id
      */
@@ -104,13 +112,26 @@ public class OaTurnoverDO extends BaseDO {
      * 当前审核人员工uuid
      */
     private String currentAuditEmployeeUuid;
+    /**
+     * 当前审核人员工姓名
+     */
+    private String currentAuditEmployeeName;
     /**
      * 最后审核时间
      */
     private LocalDateTime finalAuditDate;
     /**
-     * 数据来源，0流程添加、1手动添加
+     * 申请人选择的审批人
      */
-    private String infoSource;
+    private String startUserSelectAssignees;
+    /**
+     * 申请人id
+     */
+    private Long applyEmployeeId;
+    /**
+     * 申请人姓名
+     */
+    private String applyEmployeeName;
+
 
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/turnover/OaTurnOverMapper.java

@@ -17,27 +17,13 @@ public interface OaTurnOverMapper extends BaseMapperX<OaTurnoverDO> {
 
     default PageResult<OaTurnoverDO> selectPage(OaTurnoverPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<OaTurnoverDO>()
-                .eqIfPresent(OaTurnoverDO::getTurnoverId, reqVO.getTurnoverId())
-                .eqIfPresent(OaTurnoverDO::getEmployeeId, reqVO.getEmployeeId())
-                .eqIfPresent(OaTurnoverDO::getEmployeeUuid, reqVO.getEmployeeUuid())
                 .likeIfPresent(OaTurnoverDO::getEmployeeName, reqVO.getEmployeeName())
-                .eqIfPresent(OaTurnoverDO::getUserId, reqVO.getUserId())
-                .eqIfPresent(OaTurnoverDO::getUserUuid, reqVO.getUserUuid())
+                .likeIfPresent(OaTurnoverDO::getEmployeePhone, reqVO.getEmployeePhone())
                 .eqIfPresent(OaTurnoverDO::getDeptId, reqVO.getDeptId())
-                .eqIfPresent(OaTurnoverDO::getDeptUuid, reqVO.getDeptUuid())
                 .eqIfPresent(OaTurnoverDO::getPosition, reqVO.getPosition())
-                .betweenIfPresent(OaTurnoverDO::getStartDate, reqVO.getStartDate())
                 .betweenIfPresent(OaTurnoverDO::getTurnoverDate, reqVO.getTurnoverDate())
-                .eqIfPresent(OaTurnoverDO::getTurnoverReason, reqVO.getTurnoverReason())
-                .eqIfPresent(OaTurnoverDO::getRemarks, reqVO.getRemarks())
-                .eqIfPresent(OaTurnoverDO::getProcInstId, reqVO.getProcInstId())
                 .eqIfPresent(OaTurnoverDO::getAuditStatus, reqVO.getAuditStatus())
-                .eqIfPresent(OaTurnoverDO::getCurrentAuditUserId, reqVO.getCurrentAuditUserId())
-                .eqIfPresent(OaTurnoverDO::getCurrentAuditUserUuid, reqVO.getCurrentAuditUserUuid())
-                .eqIfPresent(OaTurnoverDO::getCurrentAuditEmployeeId, reqVO.getCurrentAuditEmployeeId())
-                .eqIfPresent(OaTurnoverDO::getCurrentAuditEmployeeUuid, reqVO.getCurrentAuditEmployeeUuid())
-                .betweenIfPresent(OaTurnoverDO::getFinalAuditDate, reqVO.getFinalAuditDate())
-                .eqIfPresent(OaTurnoverDO::getInfoSource, reqVO.getInfoSource())
+                .likeIfPresent(OaTurnoverDO::getApplyEmployeeName, reqVO.getApplyEmployeeName())
                 .betweenIfPresent(OaTurnoverDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(OaTurnoverDO::getId));
     }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/renew/OaRenewServiceImpl.java

@@ -608,7 +608,7 @@ public class OaRenewServiceImpl implements OaRenewService {
             List<DeptRespDTO> deptList = deptApi.getDeptList(deptIdList);
             for (OaRenewRespVO respVO : oaRenewRespVOList) {
                 for (DeptRespDTO dept : deptList) {
-                    if (respVO.getDeptId() == dept.getId()) {
+                    if (dept.getId() != null && dept.getId().equals(respVO.getDeptId())) {
                         respVO.setDeptName(dept.getName());
                         break;
                     }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/turnover/OaTurnoverService.java

@@ -2,65 +2,41 @@ package cn.iocoder.yudao.module.bpm.service.oa.turnover;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverRespVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverSaveReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.turnover.OaTurnoverDO;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import javax.validation.Valid;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskReturnReqVO;
 
 /**
  * 离职流程信息 Service 接口
  *
  * @author dp
  */
-public interface OaTurnoverService extends IService<OaTurnoverDO> {
+public interface OaTurnoverService {
+
+    Long stagingOaTurnover(OaTurnoverSaveReqVO stagingReqVO);
 
-    Long startOaTurnover(Long userId, @Valid OaTurnoverSaveReqVO createReqVO);
+    Long commitOaTurnover(OaTurnoverSaveReqVO commitReqVO);
 
-    Long completeTrueOaTurnover(Long userId, BpmTaskApproveReqVO reqVO);
+    Long agreeOaTurnover(BpmTaskApproveReqVO agreeReqVO);
 
-    Long completeFalseOaTurnover(Long userId, BpmTaskApproveReqVO reqVO);
+    Long disagreeOaTurnover(BpmTaskReturnReqVO disagreeReqVO);
 
-    Long updateCompleteOaTurnover(Long userId, @Valid OaTurnoverSaveReqVO createReqVO, @Valid BpmTaskApproveReqVO reqVO);
-    
+    Long revocationOaTurnover(BpmTaskApproveReqVO revocationReqVO);
 
-    /**
-     * 创建离职流程信息
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createOaTurnover(@Valid OaTurnoverSaveReqVO createReqVO);
+    Long reCommitOaTurnover(OaTurnoverSaveReqVO reCommitReqVO);
 
-    /**
-     * 更新离职流程信息
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateOaTurnover(@Valid OaTurnoverSaveReqVO updateReqVO);
+    Long closeOaTurnover(Long id);
 
-    /**
-     * 删除离职流程信息
-     *
-     * @param id 编号
-     */
     void deleteOaTurnover(Long id);
 
-    /**
-     * 获得离职流程信息
-     *
-     * @param id 编号
-     * @return 离职流程信息
-     */
-    OaTurnoverDO getOaTurnover(Long id);
-
-    /**
-     * 获得离职流程信息分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 离职流程信息分页
-     */
-    PageResult<OaTurnoverDO> getOaTurnoverPage(OaTurnoverPageReqVO pageReqVO);
+    OaTurnoverRespVO getOaTurnover(Long id);
+
+    OaTurnoverRespVO getOaTurnoverByProcInstId(String procInstId);
+
+    PageResult<OaTurnoverRespVO> getOaTurnoverPage(OaTurnoverPageReqVO pageReqVO);
+
+    PageResult<OaTurnoverRespVO> exportOaTurnoverExcel(OaTurnoverPageReqVO pageReqVO);
+
 
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/turnover/OaTurnoverServiceImpl.java

@@ -2,19 +2,34 @@ package cn.iocoder.yudao.module.bpm.service.oa.turnover;
 
 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.turnover.vo.OaTurnoverPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverRespVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.turnover.vo.OaTurnoverSaveReqVO;
 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.turnover.OaTurnoverDO;
 import cn.iocoder.yudao.module.bpm.dal.mysql.oa.turnover.OaTurnOverMapper;
+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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
@@ -24,13 +39,11 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+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_DIMISSION_NOT_EXISTS;
+import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_TURNOVER_NOT_EXISTS;
 
 /**
  * 离职流程信息 Service 实现类
@@ -39,7 +52,7 @@ import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_DIMISSION_
  */
 @Service
 @Validated
-public class OaTurnoverServiceImpl extends ServiceImpl<OaTurnOverMapper, OaTurnoverDO> implements OaTurnoverService {
+public class OaTurnoverServiceImpl implements OaTurnoverService {
 
 
     /**
@@ -49,7 +62,7 @@ public class OaTurnoverServiceImpl extends ServiceImpl<OaTurnOverMapper, OaTurno
 
 
     @Resource
-    private OaTurnOverMapper oaTurnOverMapper;
+    private OaTurnOverMapper oaTurnoverMapper;
 
     @Resource
     private BpmProcessInstanceApi processInstanceApi;
@@ -60,90 +73,213 @@ public class OaTurnoverServiceImpl extends ServiceImpl<OaTurnOverMapper, OaTurno
     @Resource
     private TaskService taskService;
 
+    @Resource
+    private FileApi fileApi;
+
+    @Resource
+    private AdminUserApi adminUserApi;
+
+    @Resource
+    private DeptApi deptApi;
+
     @Override
     @Transactional
-    public Long startOaTurnover(Long userId, OaTurnoverSaveReqVO createReqVO) {
-        //判断是否已经发起流程
-        Boolean auditPass = createReqVO.getAuditPass();
-        // 创建单据uuid
-        String uuid = IdUtil.fastSimpleUUID();
-        OaTurnoverDO oaTurnover = BeanUtils.toBean(createReqVO, OaTurnoverDO.class);
+    public Long stagingOaTurnover(OaTurnoverSaveReqVO stagingReqVO) {
+        // 登录人信息
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        AdminUserRespDTO loginUser = adminUserApi.getUser(loginUserId);
+        Objects.requireNonNull(loginUser, "登录用户不能为空");
+        // 转正人信息
+        AdminUserRespDTO employee = adminUserApi.getUser(stagingReqVO.getEmployeeId());
+
+        OaTurnoverDO oaTurnover = BeanUtils.toBean(stagingReqVO, OaTurnoverDO.class);
         if (StringUtils.isBlank(oaTurnover.getTurnoverId())) {
+            // 创建单据uuid
+            String uuid = IdUtil.fastSimpleUUID();
             oaTurnover.setTurnoverId(uuid);
         }
+        if (employee != null) {
+            oaTurnover.setEmployeeId(loginUser.getId());
+            oaTurnover.setEmployeeName(loginUser.getNickname());
+            oaTurnover.setEmployeePhone(loginUser.getMobile());
+            oaTurnover.setDeptId(loginUser.getDeptId());
+            oaTurnover.setPosition("员工职位");
+            oaTurnover.setEntryDate("2023-01-01");
+            oaTurnover.setUserId(loginUser.getId());
+        }
+        oaTurnover.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_STAGING);
+        oaTurnover.setInfoSource("0");
+        oaTurnover.setApplyEmployeeId(loginUser.getId());
+        oaTurnover.setApplyEmployeeName(loginUser.getNickname());
+        // 暂存不保存审批人信息
+        oaTurnover.setStartUserSelectAssignees(null);
         // 保存或更新表单信息
-        this.saveOrUpdate(oaTurnover);
-
-        // 提交
-        if (auditPass) {
-            // 发起 BPM 流程
-            Map<String, Object> processInstanceVariables = new HashMap<>();
-            processInstanceVariables.put("auditPass", auditPass);
-            //添加审批人信息
-            Map<String, List<Long>> startUserSelectAssignees = new HashMap<>();
-            startUserSelectAssignees.put("approver", createReqVO.getStartUserSelectAssignees());
-            String processInstanceId = processInstanceApi
-                    .createProcessInstance(userId,
-                            new BpmProcessInstanceCreateReqDTO()
-                                    .setProcessDefinitionKey(PROCESS_KEY)
-                                    .setVariables(processInstanceVariables)
-                                    .setBusinessKey(String.valueOf(oaTurnover.getId()))
-                                    .setStartUserSelectAssignees(startUserSelectAssignees));
-
-            //获取下一个审批人
-            Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult();
-
-            // 将工作流的编号，单据状态 最后一次审批时间 当前审批人  更新到 OA 转正中
-            oaTurnOverMapper.updateById(new OaTurnoverDO()
-                    .setId(oaTurnover.getId())
-                    .setProcInstId(processInstanceId)
-                    .setAuditStatus("1")
-                    .setTurnoverId(uuid)
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setCurrentAuditEmployeeId(Long.valueOf(task.getAssignee())));
+        if (oaTurnover.getId() == null) {
+            oaTurnoverMapper.insert(oaTurnover);
+        } else {
+            oaTurnoverMapper.updateById(oaTurnover);
+        }
+        // 保存业务uuid到附件中
+        saveFileList(stagingReqVO.getFileIdList(), oaTurnover.getTurnoverId());
 
-            // TODO 发送通知
+        return oaTurnover.getId();
+    }
 
-        }else {
-            // 暂存，不发起流程
-            // 将单据状态 更新到 OA转正中
-            oaTurnOverMapper.updateById(new OaTurnoverDO()
-                    .setId(oaTurnover.getId())
-                    .setAuditStatus("0"));
+    @Override
+    @Transactional
+    public Long commitOaTurnover(OaTurnoverSaveReqVO 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(commitReqVO.getEmployeeId());
+        if (employee == null) {
+            throw exception(ErrorCodeConstants.OA_EMPLOYEE_NOT_EXISTS);
         }
 
-        // TODO 保存或更新附件uuid
-        if (CollectionUtil.isNotEmpty(createReqVO.getFileIdList())) {
+
+        OaTurnoverDO oaTurnover = BeanUtils.toBean(commitReqVO, OaTurnoverDO.class);
+        if (StringUtils.isBlank(oaTurnover.getTurnoverId())) {
+            // 创建单据uuid
+            String uuid = IdUtil.fastSimpleUUID();
+            oaTurnover.setTurnoverId(uuid);
         }
+        oaTurnover.setEmployeeId(employee.getId());
+        oaTurnover.setEmployeeName(employee.getNickname());
+        oaTurnover.setEmployeePhone(employee.getMobile());
+        oaTurnover.setDeptId(employee.getDeptId());
+        oaTurnover.setPosition("员工职位");
+        oaTurnover.setEntryDate("2023-01-01");
+        oaTurnover.setUserId(loginUser.getId());
+        oaTurnover.setInfoSource("0");
+        oaTurnover.setApplyEmployeeId(loginUser.getId());
+        oaTurnover.setApplyEmployeeName(loginUser.getNickname());
+        // 保存或更新表单信息
+        if (oaTurnover.getId() == null) {
+            oaTurnoverMapper.insert(oaTurnover);
+        } else {
+            OaTurnoverDO oaTurnoverDO = oaTurnoverMapper.selectById(oaTurnover.getId());
+            if (StrUtil.isNotBlank(oaTurnoverDO.getProcInstId())) {
+                throw exception(ErrorCodeConstants.PROCESS_INSTANCE_CREATE_FAIL_HAS_PROCESS);
+            }
+            oaTurnoverMapper.updateById(oaTurnover);
+        }
+        // 发起流程
+        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(oaTurnover.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、单据状态、最后一次审批时间、当前审批人更新到单据信息中
+        oaTurnoverMapper.updateById(new OaTurnoverDO()
+                .setId(oaTurnover.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(), oaTurnover.getTurnoverId());
+        // TODO DP 发送提交成功站内信
         return oaTurnover.getId();
     }
+
     @Override
-    public Long completeTrueOaTurnover(Long userId, BpmTaskApproveReqVO reqVO) {
-        Task currentTask = bpmTaskService.getTask(reqVO.getId());
+    @Transactional
+    public Long agreeOaTurnover(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<OaTurnoverDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(OaTurnoverDO::getProcInstId, currentTask.getProcessInstanceId());
+        OaTurnoverDO oaTurnover = oaTurnoverMapper.selectOne(lambdaQueryWrapper);
+        // 如果是最后一个人审批同意，设置流程审批状态为已审核
+        String[] auditPersons = oaTurnover.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);
+        }
         // 审批同意
-        bpmTaskService.approveTask(userId, reqVO);
+        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();
+        OaTurnoverDO oaTurnoverDO = new OaTurnoverDO();
         if (nextTask != null) {
-            LambdaUpdateWrapper<OaTurnoverDO> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.set(OaTurnoverDO::getAuditStatus, "2")
-                    .set(OaTurnoverDO::getCurrentAuditEmployeeId, nextTask.getAssignee())
-                    .set(OaTurnoverDO::getFinalAuditDate, new Date())
-                    .eq(OaTurnoverDO::getProcInstId, currentTask.getProcessInstanceId());
-            oaTurnOverMapper.update(updateWrapper);
+            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);
+            oaTurnoverDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITING)
+                    .setCurrentAuditEmployeeId(currentAuditEmployeeId)
+                    .setCurrentAuditEmployeeName(currentAuditEmployee.getNickname())
+                    .setFinalAuditDate(LocalDateTime.now())
+                    .setId(oaTurnover.getId());
+
         } else {
-            LambdaUpdateWrapper<OaTurnoverDO> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.set(OaTurnoverDO::getAuditStatus, "3")
-                    .set(OaTurnoverDO::getCurrentAuditEmployeeId, null)
-                    .set(OaTurnoverDO::getFinalAuditDate, new Date())
-                    .eq(OaTurnoverDO::getProcInstId, currentTask.getProcessInstanceId());
-            oaTurnOverMapper.update(updateWrapper);
+            oaTurnoverDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITED)
+                    .setCurrentAuditEmployeeId(null)
+                    .setCurrentAuditEmployeeName(null)
+                    .setFinalAuditDate(LocalDateTime.now())
+                    .setId(oaTurnover.getId());
 
             // TODO 复制业务单据信息到业务模块单据表
 
         }
+        oaTurnoverMapper.updateById(oaTurnoverDO);
         // 发送通知
 
         // 返回
@@ -151,80 +287,188 @@ public class OaTurnoverServiceImpl extends ServiceImpl<OaTurnOverMapper, OaTurno
     }
 
     @Override
-    public Long completeFalseOaTurnover(Long userId, BpmTaskApproveReqVO reqVO) {
+    @Transactional
+    public Long disagreeOaTurnover(BpmTaskReturnReqVO disagreeReqVO) {
+        // 登录人信息
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        // TODO DP 根据登录人查询出对应的员工信息
 
-        Task currentTask = bpmTaskService.getTask(reqVO.getId());
+        Task currentTask = bpmTaskService.getTask(disagreeReqVO.getId());
 
-        BpmTaskReturnReqVO reqVO2 = BeanUtils.toBean(reqVO, BpmTaskReturnReqVO.class);
-        reqVO2.setTargetTaskDefinitionKey("modifyApply");
-        bpmTaskService.returnTask(userId, reqVO2);
+        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<OaTurnoverDO> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.set(OaTurnoverDO::getCurrentAuditEmployeeId, nextTask.getAssignee())
-                .set(OaTurnoverDO::getFinalAuditDate, new Date())
-                .set(OaTurnoverDO::getAuditStatus, "0")
+        updateWrapper.set(OaTurnoverDO::getCurrentAuditEmployeeId, currentAuditEmployeeId)
+                .set(OaTurnoverDO::getCurrentAuditEmployeeName, currentAuditEmployee.getNickname())
+                .set(OaTurnoverDO::getFinalAuditDate, LocalDateTime.now())
+                .set(OaTurnoverDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_RETURNED)
                 .eq(OaTurnoverDO::getProcInstId, currentTask.getProcessInstanceId());
-        oaTurnOverMapper.update(updateWrapper);
+        oaTurnoverMapper.update(updateWrapper);
 
         // 发送通知
 
-        // 返回
         return 1L;
     }
 
     @Override
-    public Long updateCompleteOaTurnover(Long userId, OaTurnoverSaveReqVO createReqVO, BpmTaskApproveReqVO reqVO) {
-        // 判断是否已经发起流程
-        Boolean auditPass = createReqVO.getAuditPass();
+    @Transactional
+    public Long revocationOaTurnover(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<OaTurnoverDO> lambdaQueryWrapper = new LambdaQueryWrapper<OaTurnoverDO>()
+                .eq(OaTurnoverDO::getProcInstId, currentTask.getProcessInstanceId());
+        OaTurnoverDO oaTurnoverDO = oaTurnoverMapper.selectOne(lambdaQueryWrapper);
+        if (!DictDataConstants.OA_AUDIT_STATUS_COMMITTED.equals(oaTurnoverDO.getAuditStatus())
+                || !Objects.equals(String.valueOf(loginUserId), oaTurnoverDO.getCreator())) {
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.TASK_REVOCATION_NOT_ALLOWED);
+        }
 
-        OaTurnoverDO oaTurnover = BeanUtils.toBean(createReqVO, OaTurnoverDO.class);
+        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 currentTask = taskService.createTaskQuery().processInstanceId(oaTurnover.getProcInstId()).singleResult();
+        Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
+        Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
+        AdminUserRespDTO currentAuditEmployee = adminUserApi.getUser(currentAuditEmployeeId);
 
-        //审批通过
-        bpmTaskService.approveTask(userId, reqVO);
+        // 更新单据状态，当前处理人，最后处理时间
+        LambdaUpdateWrapper<OaTurnoverDO> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(OaTurnoverDO::getCurrentAuditEmployeeId, currentAuditEmployeeId)
+                .set(OaTurnoverDO::getCurrentAuditEmployeeName, currentAuditEmployee.getNickname())
+                .set(OaTurnoverDO::getFinalAuditDate, LocalDateTime.now())
+                .set(OaTurnoverDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_RECALLED)
+                .eq(OaTurnoverDO::getProcInstId, currentTask.getProcessInstanceId());
+        oaTurnoverMapper.update(updateWrapper);
 
-        // 提交
-        if (auditPass) {
-            Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
+        // 发送通知
 
-            oaTurnover.setAuditStatus("1");
-            oaTurnover.setCurrentAuditEmployeeId(Long.valueOf(nextTask.getAssignee()));
-            oaTurnover.setFinalAuditDate(LocalDateTime.now());
-            oaTurnOverMapper.updateById(oaTurnover);
+        return 1L;
+    }
 
-        } else {
-            OaTurnoverDO oaTurnoverClose = new OaTurnoverDO();
-            oaTurnoverClose.setId(oaTurnover.getId());
-            oaTurnoverClose.setAuditStatus("4");
-            oaTurnoverClose.setCurrentAuditEmployeeId(null);
-            oaTurnoverClose.setFinalAuditDate(LocalDateTime.now());
-            oaTurnOverMapper.updateById(oaTurnoverClose);
+    @Override
+    @Transactional
+    public Long reCommitOaTurnover(OaTurnoverSaveReqVO 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(reCommitReqVO.getEmployeeId());
+        if (employee == null) {
+            throw exception(ErrorCodeConstants.OA_EMPLOYEE_NOT_EXISTS);
         }
 
-        return oaTurnover.getId();
-    }
+        OaTurnoverDO oaTurnoverNew = BeanUtils.toBean(reCommitReqVO, OaTurnoverDO.class);
+        OaTurnoverDO oaTurnoverOld = oaTurnoverMapper.selectById(oaTurnoverNew.getId());
+        oaTurnoverNew.setTurnoverId(oaTurnoverOld.getTurnoverId())
+                .setProcInstId(oaTurnoverOld.getProcInstId());
+
+        oaTurnoverNew.setEmployeeId(employee.getId());
+        oaTurnoverNew.setEmployeeName(employee.getNickname());
+        oaTurnoverNew.setEmployeePhone(employee.getMobile());
+        oaTurnoverNew.setDeptId(employee.getDeptId());
+        oaTurnoverNew.setPosition("员工职位");
+        oaTurnoverNew.setEntryDate("2023-01-01");
+        oaTurnoverNew.setUserId(loginUser.getId());
+        oaTurnoverNew.setApplyEmployeeId(loginUser.getId());
+        oaTurnoverNew.setApplyEmployeeName(loginUser.getNickname());
+
+        Task currentTask = taskService.createTaskQuery().processInstanceId(oaTurnoverNew.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);
+            // 保存审批人信息
+            oaTurnoverNew.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);
+        oaTurnoverNew.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_COMMITTED)
+                .setCurrentAuditEmployeeId(currentAuditEmployeeId)
+                .setCurrentAuditEmployeeName(currentAuditEmployee.getNickname())
+                .setFinalAuditDate(LocalDateTime.now());
+        oaTurnoverMapper.updateById(oaTurnoverNew);
 
-    @Override
-    public Long createOaTurnover(OaTurnoverSaveReqVO createReqVO) {
-        // 插入
-        OaTurnoverDO oaTurnover = BeanUtils.toBean(createReqVO, OaTurnoverDO.class);
-        oaTurnOverMapper.insert(oaTurnover);
-        // 返回
-        return oaTurnover.getId();
+        // 保存业务uuid到附件中
+        saveFileList(reCommitReqVO.getFileIdList(), oaTurnoverNew.getTurnoverId());
+
+        return 1L;
     }
 
     @Override
-    public void updateOaTurnover(OaTurnoverSaveReqVO updateReqVO) {
-        // 校验存在
-        validateOaTurnoverExists(updateReqVO.getId());
-        // 更新
-        OaTurnoverDO updateObj = BeanUtils.toBean(updateReqVO, OaTurnoverDO.class);
-        oaTurnOverMapper.updateById(updateObj);
+    @Transactional
+    public Long closeOaTurnover(Long id) {
+        if (id == null) {
+            throw exception(ErrorCodeConstants.SERVICE_ID_NOT_EXISTS);
+        }
+        // 登录人信息
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        // TODO DP 根据登录人查询出对应的员工信息
+
+        OaTurnoverDO oaTurnoverDO = oaTurnoverMapper.selectById(id);
+        if (!DictDataConstants.OA_AUDIT_STATUS_RETURNED.equals(oaTurnoverDO.getAuditStatus())
+                && !DictDataConstants.OA_AUDIT_STATUS_RECALLED.equals(oaTurnoverDO.getAuditStatus())) {
+            throw exception(ErrorCodeConstants.TASK_CLOSE_NOT_ALLOWED);
+        }
+
+        Task currentTask = taskService.createTaskQuery().processInstanceId(oaTurnoverDO.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<OaTurnoverDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        lambdaUpdateWrapper.set(OaTurnoverDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_CLOSED)
+                .set(OaTurnoverDO::getCurrentAuditEmployeeId, null)
+                .set(OaTurnoverDO::getCurrentAuditEmployeeName, null)
+                .set(OaTurnoverDO::getFinalAuditDate, LocalDateTime.now())
+                .eq(OaTurnoverDO::getId, id);
+        oaTurnoverMapper.update(lambdaUpdateWrapper);
+        return 1L;
     }
 
     @Override
@@ -232,23 +476,170 @@ public class OaTurnoverServiceImpl extends ServiceImpl<OaTurnOverMapper, OaTurno
         // 校验存在
         validateOaTurnoverExists(id);
         // 删除
-        oaTurnOverMapper.deleteById(id);
+        oaTurnoverMapper.deleteById(id);
     }
 
-    private void validateOaTurnoverExists(Long id) {
-        if (oaTurnOverMapper.selectById(id) == null) {
-            throw exception(OA_DIMISSION_NOT_EXISTS);
+    @Override
+    public OaTurnoverRespVO getOaTurnover(Long id) {
+        // 登录人信息
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        // TODO DP 根据登录人查询出对应的员工信息
+
+        OaTurnoverDO oaTurnoverDO = oaTurnoverMapper.selectById(id);
+        OaTurnoverRespVO oaTurnoverRespVO = BeanUtils.toBean(oaTurnoverDO, OaTurnoverRespVO.class);
+        if (oaTurnoverDO.getDeptId() != null) {
+            DeptRespDTO dept = deptApi.getDept(oaTurnoverDO.getDeptId());
+            if (dept != null) {
+                oaTurnoverRespVO.setDeptName(dept.getName());
+            }
+        }
+
+        String procInstId = oaTurnoverDO.getProcInstId();
+        if (StrUtil.isNotBlank(procInstId)) {
+            Task task = taskService.createTaskQuery()
+                    .processInstanceId(procInstId)
+                    .taskAssignee(String.valueOf(loginUserId))
+                    .singleResult();
+            if (DictDataConstants.OA_AUDIT_STATUS_COMMITTED.equals(oaTurnoverDO.getAuditStatus())) {
+                // 如果是已提交，不限制任务处理人是当前登录人，用于直接撤回
+                task = taskService.createTaskQuery()
+                        .processInstanceId(procInstId)
+                        .singleResult();
+            }
+            if (task != null) {
+                oaTurnoverRespVO.setTaskId(task.getId());
+            }
+        }
+
+        // 附件列表
+        List<FileDTO> fileList = fileApi.getFileDTOListByBiz(oaTurnoverDO.getTurnoverId());
+        oaTurnoverRespVO.setFileList(fileList);
+
+        // 审批记录
+        if (StrUtil.isNotBlank(oaTurnoverDO.getProcInstId())) {
+            List<BpmTaskRespVO> auditRecordList = bpmTaskService.getAuditRecordListByProcessInstanceId(oaTurnoverDO.getProcInstId());
+            oaTurnoverRespVO.setAuditRecordList(auditRecordList);
         }
+
+        // 审批人
+        String startUserSelectAssignees = oaTurnoverDO.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;
+                    }
+                }
+            }
+            oaTurnoverRespVO.setAuditUserList(auditUserList);
+        }
+
+        return oaTurnoverRespVO;
     }
 
     @Override
-    public OaTurnoverDO getOaTurnover(Long id) {
-        return oaTurnOverMapper.selectById(id);
+    public OaTurnoverRespVO getOaTurnoverByProcInstId(String procInstId) {
+        OaTurnoverDO oaTurnoverDO = oaTurnoverMapper.selectOne(OaTurnoverDO::getProcInstId, procInstId);
+        OaTurnoverRespVO oaTurnoverRespVO = BeanUtils.toBean(oaTurnoverDO, OaTurnoverRespVO.class);
+        if (oaTurnoverDO.getDeptId() != null) {
+            DeptRespDTO dept = deptApi.getDept(oaTurnoverDO.getDeptId());
+            if (dept != null) {
+                oaTurnoverRespVO.setDeptName(dept.getName());
+            }
+        }
+
+        // 附件列表
+        List<FileDTO> fileList = fileApi.getFileDTOListByBiz(oaTurnoverDO.getTurnoverId());
+        oaTurnoverRespVO.setFileList(fileList);
+
+        // 审批记录
+        if (StrUtil.isNotBlank(oaTurnoverDO.getProcInstId())) {
+            List<BpmTaskRespVO> auditRecordList = bpmTaskService.getAuditRecordListByProcessInstanceId(oaTurnoverDO.getProcInstId());
+            oaTurnoverRespVO.setAuditRecordList(auditRecordList);
+        }
+
+        // 审批人
+        String startUserSelectAssignees = oaTurnoverDO.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;
+                    }
+                }
+            }
+            oaTurnoverRespVO.setAuditUserList(auditUserList);
+        }
+
+        return oaTurnoverRespVO;
     }
 
     @Override
-    public PageResult<OaTurnoverDO> getOaTurnoverPage(OaTurnoverPageReqVO pageReqVO) {
-        return oaTurnOverMapper.selectPage(pageReqVO);
+    public PageResult<OaTurnoverRespVO> getOaTurnoverPage(OaTurnoverPageReqVO pageReqVO) {
+        PageResult<OaTurnoverDO> oaTurnoverDOPageResult = oaTurnoverMapper.selectPage(pageReqVO);
+        PageResult<OaTurnoverRespVO> oaTurnoverRespVOPageResult = BeanUtils.toBean(oaTurnoverDOPageResult, OaTurnoverRespVO.class);
+
+        List<OaTurnoverRespVO> oaTurnoverRespVOList = oaTurnoverRespVOPageResult.getList();
+        if (CollectionUtil.isNotEmpty(oaTurnoverRespVOList)) {
+            List<Long> employeeIdList = oaTurnoverRespVOList.stream().map(OaTurnoverRespVO::getCurrentAuditEmployeeId).collect(Collectors.toList());
+            List<AdminUserRespDTO> employeeList = adminUserApi.getUserList(employeeIdList);
+            for (OaTurnoverRespVO respVO : oaTurnoverRespVOList) {
+                for (AdminUserRespDTO employee : employeeList) {
+                    if (respVO.getCurrentAuditEmployeeId() == employee.getId()) {
+                        respVO.setCurrentAuditEmployeeName(employee.getNickname());
+                        break;
+                    }
+                }
+            }
+
+            List<Long> deptIdList = oaTurnoverRespVOList.stream().map(OaTurnoverRespVO::getDeptId).collect(Collectors.toList());
+            List<DeptRespDTO> deptList = deptApi.getDeptList(deptIdList);
+            for (OaTurnoverRespVO respVO : oaTurnoverRespVOList) {
+                for (DeptRespDTO dept : deptList) {
+                    if (dept.getId() != null && dept.getId().equals(respVO.getDeptId())) {
+                        respVO.setDeptName(dept.getName());
+                        break;
+                    }
+                }
+            }
+        }
+
+        return oaTurnoverRespVOPageResult;
+    }
+
+    @Override
+    public PageResult<OaTurnoverRespVO> exportOaTurnoverExcel(OaTurnoverPageReqVO pageReqVO) {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        return getOaTurnoverPage(pageReqVO);
+    }
+
+    private void validateOaTurnoverExists(Long id) {
+        OaTurnoverDO oaTurnoverDO = oaTurnoverMapper.selectById(id);
+        if (oaTurnoverDO == null) {
+            throw exception(OA_TURNOVER_NOT_EXISTS);
+        }
+        if (!DictDataConstants.OA_AUDIT_STATUS_STAGING.equals(oaTurnoverDO.getAuditStatus())) {
+            throw exception(ErrorCodeConstants.DELETE_FAIL_NOT_STAGING);
+        }
+    }
+
+    /**
+     * 保存业务uuid到附件中
+     */
+    private void saveFileList(List<Long> fileIdList, String serviceId) {
+        if (CollectionUtil.isNotEmpty(fileIdList) && StrUtil.isNotEmpty(serviceId)) {
+            fileApi.updateFileBiz(fileIdList, serviceId);
+        }
     }
 
 }