From bd9b6a58beb6b478ad27d645aa1cc0da99c25d7d Mon Sep 17 00:00:00 2001 From: 青城 <1662047068@qq.com> Date: 星期三, 09 七月 2025 18:02:37 +0800 Subject: [PATCH] 协调审批 --- src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java index 1bc54ed..81af66c 100644 --- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java +++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java @@ -7,6 +7,7 @@ import com.ruoyi.approve.pojo.ApproveProcess; import com.ruoyi.approve.service.IApproveNodeService; import com.ruoyi.approve.service.IApproveProcessService; +import com.ruoyi.approve.vo.ApproveNodeVo; import com.ruoyi.common.utils.SecurityUtils; import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; @@ -63,12 +64,30 @@ } @Override - public void updateApproveNode(ApproveNode approveNode) { + public void updateApproveNode(ApproveNodeVo approveNode) { + //鏌愪釜鑺傜偣瀹℃壒涓嶉�氳繃 + if(approveNode.getApproveNodeStatus().intValue()==2){ + //淇敼瀹℃壒娴佺▼ + ApproveNode node = approveNodeMapper.selectById(approveNode.getId()); + Long approveProcessId = node.getApproveProcessId(); + ApproveProcess approveProcess = approveProcessService.getBaseMapper().selectById(approveProcessId); + approveProcess.setApproveOverTime(new Date()); + approveProcess.setApproveStatus(3); + approveProcessService.saveOrUpdate(approveProcess); + + //瀹℃壒鑺傜偣鐘舵�佹敼鍙� + initApproveNodes(approveProcess.getApproveId()); + + return; + } + //鏇存柊瀹℃壒娴佺▼ approveProcessService.updateApproveProcessStatus(approveNode); - approveNode.setApproveNodeTime(new Date()); - - approveNodeMapper.updateById(approveNode); + //瀹℃壒娴佺▼褰撳墠瀹℃壒浜轰慨鏀� + ApproveNode node = getById(approveNode.getId()); + node.setApproveNodeTime(new Date()); + node.setApproveNodeStatus(approveNode.getApproveNodeStatus()); + approveNodeMapper.updateById(node); } } -- Gitblit v1.9.3