fix #I9KL18 当前审核人审核通过后，下个审核人还没审核，当前审核人可以撤回

OpenAuth.App/Flow/FlowRuntime.cs

@@ -538,6 +538,57 @@ namespace OpenAuth.App.Flow
             }
         }
 
+        /// <summary>
+        /// 撤销当前节点的审批
+        /// </summary>
+        public void UndoVerification()
+        {
+             // 已结束的流程不能撤销
+            if (flowInstance.IsFinish == FlowInstanceStatus.Finished 
+                || flowInstance.IsFinish == FlowInstanceStatus.Rejected)
+            {
+                throw new Exception("流程已结束，不能撤销");
+            }
+
+            if(Nodes[previousId].type == FlowNode.START)
+            {
+                throw new Exception("没有任何审批，不能撤销!你可以删除或召回这个流程");
+            }
+
+            // 恢复到上一个节点
+            currentNodeId = flowInstance.PreviousId;
+            flowInstance.ActivityId = currentNodeId;
+            flowInstance.ActivityType = GetNodeType(currentNodeId);
+            flowInstance.ActivityName = Nodes[currentNodeId].name;
+            //向前查找ActivityId的前一个结点，即连线指向ActivityId的节点
+            flowInstance.PreviousId = GetPreNode().id;
+            flowInstance.MakerList = GetNodeMarkers(Nodes[currentNodeId]);
+            
+            // 清除当前节点的审批状态
+            currentNode.setInfo.Taged = null;
+            currentNode.setInfo.UserId = "";
+            currentNode.setInfo.UserName = "";
+            currentNode.setInfo.Description = "";
+            currentNode.setInfo.TagedTime = "";
+
+            //删除当前节点的扭转记录
+            var user = AutofacContainerModule.GetService<IAuth>().GetCurrentUser().User;
+            var SugarClient = AutofacContainerModule.GetService<ISqlSugarClient>();
+            SugarClient.Deleteable<FlowInstanceTransitionHistory>().Where(u => u.InstanceId == flowInstanceId && u.CreateUserId == user.Id && u.FromNodeId == currentNodeId).ExecuteCommand();
+
+            //删除当前节点的审批记录(只删除最新的一条)
+            var latestRecord = SugarClient.Queryable<FlowInstanceOperationHistory>()
+                .Where(u => u.InstanceId == flowInstanceId && u.CreateUserId == user.Id)
+                .OrderByDescending(u => u.CreateDate)
+                .First();
+            if (latestRecord != null)
+            {
+                SugarClient.Deleteable<FlowInstanceOperationHistory>()
+                    .Where(u => u.Id == latestRecord.Id)
+                    .ExecuteCommand();
+            }
+        }
+
         #endregion 共有方法
 
         #region 获取节点审批人

OpenAuth.App/FlowInstance/FlowInstanceApp.cs

@@ -2,7 +2,7 @@
  * @Author: yubaolee <yubaolee@163.com> | ahfu~ <954478625@qq.com>
  * @Date: 2024-12-13 16:55:17
  * @Description: 工作流实例表操作
- * @LastEditTime: 2025-02-26 10:39:03
+ * @LastEditTime: 2025-03-08 13:59:47
  * Copyright (c) 2024 by yubaolee | ahfu~ , All Rights Reserved.
  */
 
@@ -332,6 +332,40 @@ namespace OpenAuth.App
             return true;
         }
 
+        /// <summary>
+        /// 撤销当前节点的审批
+        /// </summary>
+        public void UndoVerification(UndoVerificationReq request)
+        {
+            var flowInstance = Get(request.FlowInstanceId);
+            var user = _auth.GetCurrentUser().User;
+            
+            // 获取运行实例
+            var wfruntime = new FlowRuntime(flowInstance);
+
+            SugarClient.Ado.BeginTran();
+            try
+            {
+                wfruntime.UndoVerification();
+
+                // 更新流程实例状态
+                flowInstance.IsFinish = FlowInstanceStatus.Running;
+                flowInstance.SchemeContent = JsonHelper.Instance.Serialize(wfruntime.ToSchemeObj());
+                
+                SugarClient.Updateable(flowInstance).ExecuteCommand();
+
+                // 记录撤销操作
+                // wfruntime.SaveOperationHis($"【撤销审批】{user.Name}撤销了对【{wfruntime.currentNode.name}】的审批。备注：{request.Description}");
+
+                SugarClient.Ado.CommitTran();
+            }
+            catch (Exception ex)
+            {
+                SugarClient.Ado.RollbackTran();
+                throw new Exception("撤销审批失败:" + ex.Message);
+            }
+        }
+
         /// <summary>
         /// 会签
         /// </summary>
@@ -590,7 +624,16 @@ namespace OpenAuth.App
                 resp.NextNodeDesignateType = runtime.nextNode.setInfo.NodeDesignate;
                 resp.CanWriteFormItemIds = runtime.currentNode.setInfo.CanWriteFormItemIds;
             }
-
+            
+            var user = _auth.GetCurrentUser();
+            var query = SugarClient.Queryable<FlowInstanceOperationHistory>()
+                .OrderByDescending(u => u.CreateDate)
+                .First(u => u.InstanceId == id); 
+            if (query != null)
+            {
+                //最后一个审批人是当前用户，可以撤销
+                resp.CanUndoVerify = query.CreateUserId == user.User.Id;
+            }
             return resp;
         }
 

OpenAuth.App/FlowInstance/Response/FlowVerificationResp.cs

@@ -37,5 +37,17 @@ namespace OpenAuth.App.Response
         /// 当前节点的可写表单Id
         /// </summary>
         public string[] CanWriteFormItemIds { get; set; }
+        
+        /// <summary>
+        /// 是否可以撤销审核
+        ///<param>流程最后一个已审批节点的审批人是当前登录人</param>
+        /// </summary>
+        public bool CanUndoVerify { get; set; }
+
+        /// <summary>
+        /// 是否可以审核
+        ///<param>待审批的节点需要当前登录人审批</param>
+        /// </summary>
+        public bool CanVerify{ get; set; }
     }
 }