入职流程接口

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/entry/OaEntryController.java

@@ -1,34 +1,32 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.oa.entry;
 
+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.entry.vo.OaEntryPageReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.entry.vo.OaEntryRespVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.entry.vo.OaEntrySaveReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.entry.OaEntryDO;
 import cn.iocoder.yudao.module.bpm.service.oa.entry.OaEntryService;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
+import 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 static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 
@@ -42,17 +40,31 @@ public class OaEntryController {
     private OaEntryService oaEntryService;
 
     @PostMapping("/start")
-    @Operation(summary = "提交入职流程信息")
+    @Operation(summary = "提交或暂存入职流程信息")
     @PreAuthorize("@ss.hasPermission('bpm:oa-entry:start')")
     public CommonResult<Integer> startOaEntry(@Valid @RequestBody OaEntrySaveReqVO createReqVO) {
-        return success(oaEntryService.startOaEntry(getLoginUserId(),createReqVO));
+        return success(oaEntryService.startOaEntry(getLoginUserId(), createReqVO));
+    }
+
+    @PostMapping("/completeTure")
+    @Operation(summary = "审批同意入职流程信息")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:complete-true')")
+    public CommonResult<Integer> completeTrueOaEntry(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
+        return success(oaEntryService.completeTrueOaEntry(getLoginUserId(), reqVO));
+    }
+
+    @PostMapping("/completeFalse")
+    @Operation(summary = "驳回或撤回入职流程信息")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:complete-false')")
+    public CommonResult<Integer> completeFalseOaEntry(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
+        return success(oaEntryService.completeFalseOaEntry(getLoginUserId(), reqVO));
     }
 
-    @PostMapping("/complete")
-    @Operation(summary = "审批入职流程信息")
-    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:complete')")
-    public CommonResult<Integer> completeOaEntry(@Valid @RequestBody OaEntrySaveReqVO createReqVO,@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
-        return success(oaEntryService.completeOaEntry(getLoginUserId(),createReqVO,reqVO));
+    @PostMapping("/updateComplete")
+    @Operation(summary = "驳回和撤回后再次提交或关闭入职流程信息")
+    @PreAuthorize("@ss.hasPermission('bpm:oa-entry:update-complete')")
+    public CommonResult<Integer> updateCompleteOaEntry(@Valid @RequestBody OaEntrySaveReqVO createReqVO) {
+        return success(oaEntryService.updateCompleteOaEntry(getLoginUserId(), createReqVO, createReqVO.getBpmTaskApproveReqVO()));
     }
 
 //    @PostMapping("/return")

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

@@ -1,9 +1,10 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.oa.entry.vo;
 
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
+import lombok.Data;
+
+import java.util.List;
 
 @Schema(description = "管理后台 - 入职流程信息新增/修改 Request VO")
 @Data
@@ -78,4 +79,7 @@ public class OaEntrySaveReqVO {
     @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/controller/admin/task/vo/task/BpmTaskReturnReqVO.java

@@ -13,7 +13,7 @@ public class BpmTaskReturnReqVO {
     @NotEmpty(message = "任务编号不能为空")
     private String id;
 
-    @Schema(description = "回退到的任务 Key", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "回退到的任务 Key", requiredMode = Schema.RequiredMode.REQUIRED, example = "modifyApply")
     @NotEmpty(message = "回退到的任务 Key 不能为空")
     private String targetTaskDefinitionKey;
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/entry/OaEntryService.java

@@ -1,7 +1,5 @@
 package cn.iocoder.yudao.module.bpm.service.oa.entry;
 
-import javax.validation.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.entry.vo.OaEntryPageReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.entry.vo.OaEntrySaveReqVO;
@@ -9,6 +7,8 @@ import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskApproveR
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.entry.OaEntryDO;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.validation.Valid;
+
 /**
  * 入职流程信息 Service 接口
  *
@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface OaEntryService extends IService<OaEntryDO> {
 
     /**
-     * 创建入职流程信息
+     * 发起入职流程信息
      *
      * @param userId
      * @param createReqVO 创建信息
@@ -26,14 +26,32 @@ public interface OaEntryService extends IService<OaEntryDO> {
     Integer startOaEntry(Long userId, @Valid OaEntrySaveReqVO createReqVO);
 
     /**
-     * 创建入职流程信息
+     * 审批同意入职流程信息
      *
      * @param userId
-     * @param createReqVO 创建信息
      * @param reqVO  通过请求
      * @return 编号
      */
-    Integer completeOaEntry(Long userId, @Valid OaEntrySaveReqVO createReqVO,@Valid BpmTaskApproveReqVO reqVO);
+    Integer completeTrueOaEntry(Long userId, BpmTaskApproveReqVO reqVO);
+
+    /**
+     * 驳回或撤回入职流程信息
+     *
+     * @param userId
+     * @param reqVO  驳回或撤回
+     * @return 编号
+     */
+    Integer completeFalseOaEntry(Long userId, BpmTaskApproveReqVO reqVO);
+
+    /**
+     * 驳回和撤回后再次提交或关闭入职流程信息
+     *
+     * @param userId
+     * @param createReqVO 创建信息
+     * @param reqVO       通过请求
+     * @return 编号
+     */
+    Integer updateCompleteOaEntry(Long userId, @Valid OaEntrySaveReqVO createReqVO, @Valid BpmTaskApproveReqVO reqVO);
 
     /**
      * 更新入职流程信息

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/entry/OaEntryServiceImpl.java

@@ -9,15 +9,15 @@ import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.entry.vo.OaEntryPageReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.entry.vo.OaEntrySaveReqVO;
 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.entry.OaEntryDO;
 import cn.iocoder.yudao.module.bpm.dal.mysql.oa.entry.OaEntryMapper;
 import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
-import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 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.RuntimeService;
 import org.flowable.engine.TaskService;
-import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -67,115 +67,147 @@ public class OaEntryServiceImpl extends ServiceImpl<OaEntryMapper, OaEntryDO> im
     public Integer startOaEntry(Long userId, OaEntrySaveReqVO createReqVO) {
         //判断是否已经发起流程
         Boolean auditPass = createReqVO.getAuditPass();
-        //创建单据uuid
+        // 创建单据uuid
         String uuid = IdUtil.fastSimpleUUID();
-        // 插入
         OaEntryDO oaEntry = BeanUtils.toBean(createReqVO, OaEntryDO.class);
-        oaEntry.setEntryId(uuid);
+        if (StringUtils.isBlank(oaEntry.getEntryId())) {
+            oaEntry.setEntryId(uuid);
+        }
+        // 保存或更新表单信息
         this.saveOrUpdate(oaEntry);
-        //如果提交
-        if (auditPass){
+
+        // 提交
+        if (auditPass) {
             // 发起 BPM 流程
             Map<String, Object> processInstanceVariables = new HashMap<>();
-            processInstanceVariables.put("auditPass",auditPass);
+            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(oaEntry.getId()))
-                            .setStartUserSelectAssignees(startUserSelectAssignees));
+            startUserSelectAssignees.put("approver", createReqVO.getStartUserSelectAssignees());
+            String processInstanceId = processInstanceApi
+                    .createProcessInstance(userId,
+                            new BpmProcessInstanceCreateReqDTO()
+                                    .setProcessDefinitionKey(PROCESS_KEY)
+                                    .setVariables(processInstanceVariables)
+                                    .setBusinessKey(String.valueOf(oaEntry.getId()))
+                                    .setStartUserSelectAssignees(startUserSelectAssignees));
 
             //获取下一个审批人
             Task task = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult();
 
-            // 将工作流的编号，单据状态 表单uuid  最后一次审批时间 当前审批人  更新到 OA 入职中
-            oaEntryMapper.updateById(new OaEntryDO().setId(oaEntry.getId()).setProcInstId(processInstanceId).setAuditStatus("1")
-                    .setEntryId(uuid).setFinalAuditDate(new Date()).setCurrentAuditEmployeeId(task.getAssignee()));
+            // 将工作流的编号，单据状态 最后一次审批时间 当前审批人  更新到 OA 入职中
+            oaEntryMapper.updateById(new OaEntryDO()
+                    .setId(oaEntry.getId())
+                    .setProcInstId(processInstanceId)
+                    .setAuditStatus("1")
+                    .setEntryId(uuid)
+                    .setFinalAuditDate(new Date())
+                    .setCurrentAuditEmployeeId(task.getAssignee()));
+
+            // TODO 发送通知
+
         }else {
-            // 将单据状态 表单uuid 更新到 OA入职中
-            oaEntryMapper.updateById(new OaEntryDO().setId(oaEntry.getId()).setAuditStatus("0").setEntryId(uuid));
+            // 暂存，不发起流程
+            // 将单据状态 更新到 OA入职中
+            oaEntryMapper.updateById(new OaEntryDO()
+                    .setId(oaEntry.getId())
+                    .setAuditStatus("0"));
         }
 
-        //保存附件uuid
+        // TODO 保存或更新附件uuid
         if (CollectionUtil.isNotEmpty(createReqVO.getFileIdList())) {
-            // LambdaUpdateWrapper<FileDTO> wrapper = new LambdaUpdateWrapper<>();
-            // wrapper.in(FileDTO::getId, createReqVO.getFileIdList()).set(FileDTO::getServiceId, uuid);
         }
-        // todo 站内信发送
-        // loanInfoService.sendMassage(actBaseInfo);
+
         // 返回
         return oaEntry.getId();
     }
 
     @Override
-    public Integer completeOaEntry(Long userId, OaEntrySaveReqVO createReqVO, BpmTaskApproveReqVO reqVO) {
-        //判断是否已经发起流程
-        Boolean auditPass = createReqVO.getAuditPass();
-        // 修改
-        OaEntryDO oaEntry = BeanUtils.toBean(createReqVO, OaEntryDO.class);
-//        oaEntryMapper.updateById(oaEntry);
-        //判断当前单据是否存在流程实例id，如果不存在说明没有发起流程
-        if (oaEntry.getProcInstId() == null && oaEntry.getProcInstId().equals("")) {
-            // 提交
-            if (createReqVO.getAuditPass()) {
-                // 发起 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(oaEntry.getId()))
-                                .setStartUserSelectAssignees(startUserSelectAssignees));
-
-                // 将工作流的编号，单据状态 更新到 OA 入职中
-                oaEntryMapper.updateById(new OaEntryDO().setId(oaEntry.getId()).setProcInstId(processInstanceId).setAuditStatus("1"));
-            }else {
-                // 暂存 将单据状态 更新到 OA 入职中
-                oaEntryMapper.updateById(new OaEntryDO().setId(oaEntry.getId()).setAuditStatus("0"));
-            }
+    public Integer completeTrueOaEntry(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<OaEntryDO> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.set(OaEntryDO::getAuditStatus, "2")
+                    .set(OaEntryDO::getCurrentAuditEmployeeId, nextTask.getAssignee())
+                    .set(OaEntryDO::getFinalAuditDate, new Date())
+                    .eq(OaEntryDO::getProcInstId, currentTask.getProcessInstanceId());
+            oaEntryMapper.update(updateWrapper);
         } else {
-            //同意
-            if (createReqVO.getAuditPass()) {
-                //审批通过
-                bpmTaskService.approveTask(userId,reqVO);
-                //判断流程是否结束
-                ProcessInstance procIns = runtimeService.createProcessInstanceQuery().processInstanceId(createReqVO.getProcInstId()).active().singleResult();
-                if (procIns != null) {
-                    //说明流程结束
-                    //获取下一个审批人
-                    Task task = taskService.createTaskQuery().processInstanceId(createReqVO.getProcInstId()).singleResult();
-                    //  将单据状态 当前审批人 最后一次审批时间 更新到 OA 入职中
-                    oaEntryMapper.updateById(new OaEntryDO().setId(oaEntry.getId()).setAuditStatus("2").setCurrentAuditEmployeeId(task.getAssignee())
-                            .setFinalAuditDate(new Date()));
-                }else {
-                    //流程结束
-                    //todo 复制信息到入职信息表中
-
-                    //  将单据状态 更新到 OA 入职中
-                    oaEntryMapper.updateById(new OaEntryDO().setId(oaEntry.getId()).setAuditStatus("3").setCurrentAuditEmployeeId(" ").setFinalAuditDate(new Date()));
-                }
-            }else {
-//                //审批不通过
-//                BpmTaskReturnReqVO bpmTaskReturnReqVO =new BpmTaskReturnReqVO();
-//                        bpmTaskReturnReqVO.setId(reqVO.getId());
-//                        bpmTaskReturnReqVO.setReason(reqVO.getReason());
-//                        bpmTaskReturnReqVO.setTargetTaskDefinitionKey("");
-//                bpmTaskService.returnTask(userId,reqVO);
-//                //  将单据状态 当前审批人 最后一次审批时间 更新到 OA 入职中
-//                oaEntryMapper.updateById(new OaEntryDO().setId(oaEntry.getId()).setAuditStatus("4").setCurrentAuditEmployeeId(" ").setFinalAuditDate(new Date()));
-            }
+            LambdaUpdateWrapper<OaEntryDO> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.set(OaEntryDO::getAuditStatus, "3")
+                    .set(OaEntryDO::getCurrentAuditEmployeeId, null)
+                    .set(OaEntryDO::getFinalAuditDate, new Date())
+                    .eq(OaEntryDO::getProcInstId, currentTask.getProcessInstanceId());
+            oaEntryMapper.update(updateWrapper);
+
+            // TODO 复制业务单据信息到业务模块单据表
+
         }
+        // 发送通知
+
+        // 返回
+        return 1;
+    }
+
+    @Override
+    public Integer completeFalseOaEntry(Long userId, BpmTaskApproveReqVO reqVO) {
+
+        Task currentTask = bpmTaskService.getTask(reqVO.getId());
+
+        BpmTaskReturnReqVO reqVO2 = BeanUtils.toBean(reqVO, BpmTaskReturnReqVO.class);
+        reqVO2.setTargetTaskDefinitionKey("modifyApply");
+        bpmTaskService.returnTask(userId, reqVO2);
 
-        //保存附件uuid
-        LambdaUpdateWrapper<FileDTO> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.in(FileDTO::getId, createReqVO.getFileIdList()).set(FileDTO::getServiceId, createReqVO.getEntryId());
+        Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
+
+        // 更新单据状态，当前处理人，最后处理时间
+        LambdaUpdateWrapper<OaEntryDO> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(OaEntryDO::getCurrentAuditEmployeeId, nextTask.getAssignee())
+                .set(OaEntryDO::getFinalAuditDate, new Date())
+                .set(OaEntryDO::getAuditStatus, "0")
+                .eq(OaEntryDO::getProcInstId, currentTask.getProcessInstanceId());
+        oaEntryMapper.update(updateWrapper);
+
+        // 发送通知
 
-        // todo 站内信发送
-        // loanInfoService.sendMassage(actBaseInfo);
         // 返回
+        return 1;
+    }
+
+    @Override
+    public Integer updateCompleteOaEntry(Long userId, OaEntrySaveReqVO createReqVO, BpmTaskApproveReqVO reqVO) {
+        // 判断是否已经发起流程
+        Boolean auditPass = createReqVO.getAuditPass();
+
+        OaEntryDO oaEntry = BeanUtils.toBean(createReqVO, OaEntryDO.class);
+
+        Task currentTask = taskService.createTaskQuery().processInstanceId(oaEntry.getProcInstId()).singleResult();
+
+        //审批通过
+        bpmTaskService.approveTask(userId, reqVO);
+
+        // 提交
+        if (auditPass) {
+            Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
+
+            oaEntry.setAuditStatus("1");
+            oaEntry.setCurrentAuditEmployeeId(nextTask.getAssignee());
+            oaEntry.setFinalAuditDate(new Date());
+            oaEntryMapper.updateById(oaEntry);
+
+        } else {
+            OaEntryDO oaEntryClose = new OaEntryDO();
+            oaEntryClose.setId(oaEntry.getId());
+            oaEntryClose.setAuditStatus("4");
+            oaEntryClose.setCurrentAuditEmployeeId(null);
+            oaEntryClose.setFinalAuditDate(new Date());
+            oaEntryMapper.updateById(oaEntryClose);
+        }
+
         return oaEntry.getId();
     }