jiazx0107
2026-01-17 7411561962ca6e45e32844d7a626a6e89b8292e5
fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java
@@ -85,7 +85,7 @@
        process.setAssigneeName(work.getCreateBy());
        process.setAssigneeId(work.getCreateById());
        process.setNode(WorkNode.NODE_START.getCode());
        orderProcessService.addData(process);
        orderProcessService.addData(process,false);
        return BaseResp.success();
    }
@@ -130,7 +130,7 @@
        process.setAssigneeName(work.getCreateBy());
        process.setAssigneeId(work.getCreateById());
        process.setNode(WorkNode.NODE_START.getCode());
        orderProcessService.addData(process);
        orderProcessService.addData(process,false);
        return BaseResp.success();
    }
@@ -201,22 +201,21 @@
        process.setAssigneeName(ContextUtil.getLoginUserName());
        process.setAssigneeId(ContextUtil.getLoginName());
        WorkNode node = this.getNextNode(work.getNode(), conf);
        WorkNode nextNode = this.getNextNode(work.getNode(), conf);
        log.info("工单审批:{},当前节点:{},下一节点:{}", work.getTitle(), work.getNode(), node);
        log.info("工单审批:{},当前节点:{},下一节点:{}", work.getTitle(), work.getNode(), nextNode);
        //通过操作
        if ("pass".equals(action)) {
            process.setAction("通过");
            process.setNode(node.getCode());
            process.setNode(work.getNode());
            //结束判断,如果是结束节点,则结束工单
            if (WorkNode.NODE_END.getCode().equals(process.getNode())) {
            if (WorkNode.NODE_END.getCode().equals(nextNode.getCode())) {
                work.setStatus(WorkStatus.STATUS_50.getCode());
                work.setAssigneeName(process.getAssigneeName());
                work.setAssigneeId(process.getAssigneeId());
                work.setNode(nextNode.getCode());
                orderService.complete(work);
            }
        }
@@ -231,7 +230,7 @@
        }
        //增加审批记录
        orderProcessService.addData(process);
        orderProcessService.addData(process,nextNode.equals(WorkNode.NODE_END));
        return BaseResp.success();
    }