审批流程bug修改

无关风月

2 天以前 9d1a18030d8f82aa264d1378186eb00c31c9af20

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowAuditController.java

@@ -84,6 +84,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -108,7 +110,8 @@
 */
@RestController
@RequestMapping("/oa-approval-flow-audit")
@Api(tags = "我审批的/我发起的/通用审批接口")
@Api(tags = "我审批的-我发起的-通用审批接口")
@Slf4j
public class OaApprovalFlowAuditController {
    @Resource
    private OaApprovalTodoService approvalTodoService;
@@ -243,7 +246,7 @@
            }
            SysUser sysUser = userMap.get(approvalApplication.getApplicantUserId().longValue());
            if (sysUser!=null){
                approvalTodoVO.setApplyUserName(sysUser.getUserName());
                approvalTodoVO.setApplyUserName(sysUser.getNickName());
                TDept tDept = deptMap.get(Integer.parseInt(sysUser.getDeptId()));
                if (tDept!=null){
                    approvalTodoVO.setApplyDeptName(tDept.getDeptName());
@@ -421,7 +424,7 @@
            }
            SysUser sysUser = userMap.get(approvalApplication.getApplicantUserId().longValue());
            if (sysUser!=null){
                approvalTodoVO.setApplyUserName(sysUser.getUserName());
                approvalTodoVO.setApplyUserName(sysUser.getNickName());
                TDept tDept = deptMap.get(Integer.parseInt(sysUser.getDeptId()));
                if (tDept!=null){
                    approvalTodoVO.setApplyDeptName(tDept.getDeptName());
@@ -532,6 +535,7 @@
    @Log(title = "审批-通用审批接口", businessType = BusinessType.INSERT)
    @ApiOperation(value = "通用审批接口")
    @PostMapping(value = "/audit")
    @Transactional
    public R addLeave(@RequestBody AuditDTO dto) {

        OaApprovalApplications approvalApplications = approvalApplicationsService.getById(dto.getApprovalApplicationId());
@@ -570,6 +574,7 @@
        approvalFlowAudit.setReason(dto.getReason());
        approvalFlowAuditService.save(approvalFlowAudit);
        List<OaApprovalFlowNode> approvalFlowNodes = approvalFlowNodeService.lambdaQuery().eq(OaApprovalFlowNode::getApprovalId, approval.getId())
                .eq(OaApprovalFlowNode::getStatus,1)
                .orderByAsc(OaApprovalFlowNode::getSortOrder).list();
        if (dto.getApprovalStatus() == 1) {
            // 判断当前是否处于最后一个节点
@@ -607,14 +612,18 @@
                    assetMainService.saveAssetByApprovalApplicationId(approvalApplications.getId());
                }
            } else {
                log.info("不为最后一个审批节点");
                // 生成下一个节点的待办事项
                for (int i = 0; i < approvalFlowNodes.size(); i++) {
                    if (approvalApplications.getCurrentFlowNodeId()
                            .equals(approvalFlowNodes.get(i).getId())) {
                    if (approvalApplications.getCurrentFlowNodeId().equals(approvalFlowNodes.get(i).getId())) {
                        log.info("匹配到审批流程，进入下一节点，当前节点id:{}", approvalFlowNodes.get(i));
                        // 申请单审批流程修改为下一节点
                        approvalApplications.setCurrentFlowNodeId(approvalFlowNodes.get(i + 1).getId());
                        OaApprovalFlowNode oaApprovalFlowNode1 = approvalFlowNodeService.getById(approvalFlowNodes.get(i + 1).getId());
                        approvalApplicationsService.updateById(approvalApplications);
                        OaApprovalFlowNode oaApprovalFlowNode1 = approvalFlowNodes.get(i + 1);
                        approvalTodoService.createApprovalTodos(approvalApplications.getId(),
                                approvalApplications.getApplicationCode(), oaApprovalFlowNode1, approvalApplications.getDeptId());
                        break;
                    }
                }
            }