lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2026-04-01 22:13:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: 流程模板end round 切换为end

Browse Source 
统一判断流程结束
          流程节点类型统一用字符串表示
This commit is contained in:
yubaolee
2025-04-17 14:44:57 +08:00
parent d32ef5b78d
commit 831053aaf1
12 changed files with 138 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenAuth.App/Flow/FlowRuntime.cs
View File

@@ -140,6 +140,14 @@ namespace OpenAuth.App.Flow
#endregion 私有方法
#region 共有方法
/// <summary>
/// 判断流程是否完成
/// </summary>
public bool IsFinish()
{
return GetNextNodeType() == Define.NODE_TYPE_END;
}
//获取下一个节点
public FlowNode GetNextNode(string nodeId = null)
@@ -157,8 +165,7 @@ namespace OpenAuth.App.Flow
{
return GetNodeType(nextNodeId);
}
return "error";
return Define.NODE_TYPE_END;
}
/// <summary>
@@ -490,7 +497,7 @@ namespace OpenAuth.App.Flow
ToNodeId = nextNodeId,
ToNodeName = nextNode?.name,
// ToNodeType = GetNextNodeType(),
IsFinish = GetNextNodeType() == Define.NODE_TYPE_END ? FlowInstanceStatus.Finished : FlowInstanceStatus.Running,
IsFinish = IsFinish() ? FlowInstanceStatus.Finished : FlowInstanceStatus.Running,
TransitionSate = 0
};

16
OpenAuth.App/FlowInstance/FlowInstanceApp.cs
View File

@@ -120,8 +120,8 @@ namespace OpenAuth.App
addFlowInstanceReq.CreateUserName = user.User.Account;
flowInstance.MakerList =
wfruntime.GetNextNodeType() != Define.NODE_TYPE_END ? wfruntime.GetNextMakers(addFlowInstanceReq) : "";
flowInstance.IsFinish = wfruntime.GetNextNodeType() == Define.NODE_TYPE_END
(!wfruntime.IsFinish()) ? wfruntime.GetNextMakers(addFlowInstanceReq) : "";
flowInstance.IsFinish = wfruntime.IsFinish()
? FlowInstanceStatus.Finished
: FlowInstanceStatus.Running;
@@ -403,11 +403,11 @@ namespace OpenAuth.App
flowInstance.PreviousId = flowInstance.ActivityId;
flowInstance.ActivityId = wfruntime.nextNodeId;
flowInstance.ActivityName = wfruntime.nextNode.name;
flowInstance.IsFinish = wfruntime.GetNextNodeType() == Define.NODE_TYPE_END
flowInstance.IsFinish = wfruntime.IsFinish()
? FlowInstanceStatus.Finished
: FlowInstanceStatus.Running;
flowInstance.MakerList =
wfruntime.GetNextNodeType() == Define.NODE_TYPE_END ? "" : wfruntime.GetNextMakers();
wfruntime.IsFinish() ? "" : wfruntime.GetNextMakers();
wfruntime.SaveTransitionHis();
}
@@ -502,8 +502,8 @@ namespace OpenAuth.App
flowInstance.PreviousId = flowInstance.ActivityId;
flowInstance.ActivityId = wfruntime.nextNodeId;
flowInstance.ActivityName = wfruntime.nextNode.name;
flowInstance.MakerList = wfruntime.GetNextNodeType() == Define.NODE_TYPE_END ? "" : wfruntime.GetNextMakers(request);
flowInstance.IsFinish = wfruntime.GetNextNodeType() == Define.NODE_TYPE_END
flowInstance.MakerList = wfruntime.IsFinish() ? "" : wfruntime.GetNextMakers(request);
flowInstance.IsFinish = wfruntime.IsFinish()
? FlowInstanceStatus.Finished
: FlowInstanceStatus.Running;
}
@@ -869,8 +869,8 @@ namespace OpenAuth.App
flowInstance.PreviousId = wfruntime.currentNodeId;
flowInstance.CreateUserId = user.User.Id;
flowInstance.CreateUserName = user.User.Account;
flowInstance.MakerList = wfruntime.GetNextNodeType() != Define.NODE_TYPE_END ? wfruntime.GetNextMakers() : "";
flowInstance.IsFinish = wfruntime.GetNextNodeType() == Define.NODE_TYPE_END
flowInstance.MakerList = (!wfruntime.IsFinish()) ? wfruntime.GetNextMakers() : "";
flowInstance.IsFinish = wfruntime.IsFinish()
? FlowInstanceStatus.Finished
: FlowInstanceStatus.Running;