转正流程审批接口

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/conversion/OaConversionController.java

@@ -1,34 +1,33 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion;
 
+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.oa.conversion.vo.OaConversionPageReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionRespVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionSaveReqVO;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.conversion.OaConversionDO;
+import cn.iocoder.yudao.module.bpm.service.oa.conversion.OaConversionService;
 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.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.io.IOException;
+import java.util.List;
 
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.conversion.OaConversionDO;
-import cn.iocoder.yudao.module.bpm.service.oa.conversion.OaConversionService;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "管理后台 - 转正流程信息")
 @RestController
@@ -39,6 +38,35 @@ public class OaConversionController {
     @Resource
     private OaConversionService oaConversionService;
 
+    @PostMapping("/start")
+    @Operation(summary = "提交或暂存转正流程信息")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-conversion:start')")
+    public CommonResult<Long> startOaConversion(@Valid @RequestBody OaConversionSaveReqVO createReqVO) {
+        return success(oaConversionService.startOaConversion(getLoginUserId(), createReqVO));
+    }
+
+    @PostMapping("/completeTure")
+    @Operation(summary = "审批同意转正流程信息")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:complete-true')")
+    public CommonResult<Long> completeTrueOaConversion(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
+        return success(oaConversionService.completeTrueOaConversion(getLoginUserId(), reqVO));
+    }
+
+    @PostMapping("/completeFalse")
+    @Operation(summary = "驳回或撤回转正流程信息")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:complete-false')")
+    public CommonResult<Long> completeFalseOaConversion(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
+        return success(oaConversionService.completeFalseOaConversion(getLoginUserId(), reqVO));
+    }
+
+    @PostMapping("/updateComplete")
+    @Operation(summary = "驳回和撤回后再次提交或关闭转正流程信息")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:update-complete')")
+    public CommonResult<Long> updateCompleteOaConversion(@Valid @RequestBody OaConversionSaveReqVO createReqVO) {
+        return success(oaConversionService.updateCompleteOaConversion(getLoginUserId(), createReqVO, createReqVO.getBpmTaskApproveReqVO()));
+    }
+
+
     @PostMapping("/create")
     @Operation(summary = "创建转正流程信息")
     @PreAuthorize("@ss.hasPermission('bpm:oa-conversion:create')")

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/conversion/OaConversionService.java

@@ -1,18 +1,29 @@
 package cn.iocoder.yudao.module.bpm.service.oa.conversion;
 
-import javax.validation.*;
-
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionPageReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionSaveReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.conversion.OaConversionDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import javax.validation.Valid;
 
 /**
  * 转正流程信息 Service 接口
  *
  * @author 芋道源码
  */
-public interface OaConversionService {
+public interface OaConversionService extends IService<OaConversionDO>{
+
+    Long startOaConversion(Long userId, @Valid OaConversionSaveReqVO createReqVO);
+
+    Long completeTrueOaConversion(Long userId, BpmTaskApproveReqVO reqVO);
+
+    Long completeFalseOaConversion(Long userId, BpmTaskApproveReqVO reqVO);
+
+    Long updateCompleteOaConversion(Long userId, @Valid OaConversionSaveReqVO createReqVO, @Valid BpmTaskApproveReqVO reqVO);
+
 
     /**
      * 创建转正流程信息

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/conversion/OaConversionServiceImpl.java

@@ -1,19 +1,36 @@
 package cn.iocoder.yudao.module.bpm.service.oa.conversion;
 
+import cn.hutool.core.collection.CollectionUtil;
+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.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionPageReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.conversion.vo.OaConversionSaveReqVO;
+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.dal.dataobject.oa.conversion.OaConversionDO;
+import cn.iocoder.yudao.module.bpm.dal.mysql.oa.conversion.OaConversionMapper;
+import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
+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;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
-import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.conversion.OaConversionDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-
-import cn.iocoder.yudao.module.bpm.dal.mysql.oa.conversion.OaConversionMapper;
+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 static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_CONVERSION_NOT_EXISTS;
 
 /**
  * 转正流程信息 Service 实现类
@@ -22,11 +39,176 @@ import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*;
  */
 @Service
 @Validated
-public class OaConversionServiceImpl implements OaConversionService {
+public class OaConversionServiceImpl extends ServiceImpl<OaConversionMapper, OaConversionDO> implements OaConversionService {
+
+    /**
+     * OA 转正对应的流程定义 KEY
+     */
+    public static final String PROCESS_KEY = "oa_conversion";
 
     @Resource
     private OaConversionMapper oaConversionMapper;
 
+    @Resource
+    private BpmProcessInstanceApi processInstanceApi;
+
+    @Resource
+    private BpmTaskService bpmTaskService;
+
+    @Resource
+    private TaskService taskService;
+
+
+    @Override
+    @Transactional
+    public Long startOaConversion(Long userId, OaConversionSaveReqVO createReqVO) {
+        //判断是否已经发起流程
+        Boolean auditPass = createReqVO.getAuditPass();
+        // 创建单据uuid
+        String uuid = IdUtil.fastSimpleUUID();
+        OaConversionDO oaConversion = BeanUtils.toBean(createReqVO, OaConversionDO.class);
+        if (StringUtils.isBlank(oaConversion.getConversionId())) {
+            oaConversion.setConversionId(uuid);
+        }
+        // 保存或更新表单信息
+        this.saveOrUpdate(oaConversion);
+
+        // 提交
+        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(oaConversion.getId()))
+                                    .setStartUserSelectAssignees(startUserSelectAssignees));
+
+            //获取下一个审批人
+            Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult();
+
+            // 将工作流的编号，单据状态 最后一次审批时间 当前审批人  更新到 OA 转正中
+            oaConversionMapper.updateById(new OaConversionDO()
+                    .setId(oaConversion.getId())
+                    .setProcInstId(processInstanceId)
+                    .setAuditStatus("1")
+                    .setConversionId(uuid)
+                    .setFinalAuditDate(LocalDateTime.now())
+                    .setCurrentAuditEmployeeId(Long.valueOf(task.getAssignee())));
+
+            // TODO 发送通知
+
+        }else {
+            // 暂存，不发起流程
+            // 将单据状态 更新到 OA转正中
+            oaConversionMapper.updateById(new OaConversionDO()
+                    .setId(oaConversion.getId())
+                    .setAuditStatus("0"));
+        }
+
+        // TODO 保存或更新附件uuid
+        if (CollectionUtil.isNotEmpty(createReqVO.getFileIdList())) {
+        }
+
+        // 返回
+        return oaConversion.getId();
+    }
+    @Override
+    public Long completeTrueOaConversion(Long userId, BpmTaskApproveReqVO reqVO) {
+        Task currentTask = bpmTaskService.getTask(reqVO.getId());
+        // 审批同意
+        bpmTaskService.approveTask(userId, reqVO);
+
+        Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
+        if (nextTask != null) {
+            LambdaUpdateWrapper<OaConversionDO> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.set(OaConversionDO::getAuditStatus, "2")
+                    .set(OaConversionDO::getCurrentAuditEmployeeId, nextTask.getAssignee())
+                    .set(OaConversionDO::getFinalAuditDate, new Date())
+                    .eq(OaConversionDO::getProcInstId, currentTask.getProcessInstanceId());
+            oaConversionMapper.update(updateWrapper);
+        } else {
+            LambdaUpdateWrapper<OaConversionDO> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.set(OaConversionDO::getAuditStatus, "3")
+                    .set(OaConversionDO::getCurrentAuditEmployeeId, null)
+                    .set(OaConversionDO::getFinalAuditDate, new Date())
+                    .eq(OaConversionDO::getProcInstId, currentTask.getProcessInstanceId());
+            oaConversionMapper.update(updateWrapper);
+
+            // TODO 复制业务单据信息到业务模块单据表
+
+        }
+        // 发送通知
+
+        // 返回
+        return 1L;
+    }
+
+    @Override
+    public Long completeFalseOaConversion(Long userId, BpmTaskApproveReqVO reqVO) {
+
+        Task currentTask = bpmTaskService.getTask(reqVO.getId());
+
+        BpmTaskReturnReqVO reqVO2 = BeanUtils.toBean(reqVO, BpmTaskReturnReqVO.class);
+        reqVO2.setTargetTaskDefinitionKey("modifyApply");
+        bpmTaskService.returnTask(userId, reqVO2);
+
+        Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
+
+        // 更新单据状态，当前处理人，最后处理时间
+        LambdaUpdateWrapper<OaConversionDO> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(OaConversionDO::getCurrentAuditEmployeeId, nextTask.getAssignee())
+                .set(OaConversionDO::getFinalAuditDate, new Date())
+                .set(OaConversionDO::getAuditStatus, "0")
+                .eq(OaConversionDO::getProcInstId, currentTask.getProcessInstanceId());
+        oaConversionMapper.update(updateWrapper);
+
+        // 发送通知
+
+        // 返回
+        return 1L;
+    }
+
+    @Override
+    public Long updateCompleteOaConversion(Long userId, OaConversionSaveReqVO createReqVO, BpmTaskApproveReqVO reqVO) {
+        // 判断是否已经发起流程
+        Boolean auditPass = createReqVO.getAuditPass();
+
+        OaConversionDO oaConversion = BeanUtils.toBean(createReqVO, OaConversionDO.class);
+
+        Task currentTask = taskService.createTaskQuery().processInstanceId(oaConversion.getProcInstId()).singleResult();
+
+        //审批通过
+        bpmTaskService.approveTask(userId, reqVO);
+
+        // 提交
+        if (auditPass) {
+            Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
+
+            oaConversion.setAuditStatus("1");
+            oaConversion.setCurrentAuditEmployeeId(Long.valueOf(nextTask.getAssignee()));
+            oaConversion.setFinalAuditDate(LocalDateTime.now());
+            oaConversionMapper.updateById(oaConversion);
+
+        } else {
+            OaConversionDO oaConversionClose = new OaConversionDO();
+            oaConversionClose.setId(oaConversion.getId());
+            oaConversionClose.setAuditStatus("4");
+            oaConversionClose.setCurrentAuditEmployeeId(null);
+            oaConversionClose.setFinalAuditDate(LocalDateTime.now());
+            oaConversionMapper.updateById(oaConversionClose);
+        }
+
+        return oaConversion.getId();
+    }
+
+
+
     @Override
     public Long createOaConversion(OaConversionSaveReqVO createReqVO) {
         // 插入