From 440ccd50d568f8c0395ce2755faa3e66656faed4 Mon Sep 17 00:00:00 2001 From: yubaolee Date: Wed, 24 Apr 2024 10:49:29 +0800 Subject: [PATCH] =?UTF-8?q?fix=20#I9HQWU=20=E5=B7=B2=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E8=BF=87=E7=9A=84=E7=94=A8=E6=88=B7=EF=BC=8C=E5=90=8E=E9=9D=A2?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E5=86=8D=E6=AC=A1=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.App/FlowInstance/FlowInstanceApp.cs | 130 +++++++++++-------- 1 file changed, 77 insertions(+), 53 deletions(-) diff --git a/OpenAuth.App/FlowInstance/FlowInstanceApp.cs b/OpenAuth.App/FlowInstance/FlowInstanceApp.cs index 1e76b3f9..af159421 100644 --- a/OpenAuth.App/FlowInstance/FlowInstanceApp.cs +++ b/OpenAuth.App/FlowInstance/FlowInstanceApp.cs @@ -321,13 +321,6 @@ namespace OpenAuth.App throw new Exception("当前用户没有审批该节点权限"); } - FlowInstanceOperationHistory flowInstanceOperationHistory = new FlowInstanceOperationHistory - { - InstanceId = instanceId, - CreateUserId = tag.UserId, - CreateUserName = tag.UserName, - CreateDate = DateTime.Now - }; //操作记录 FlowRuntime wfruntime = new FlowRuntime(flowInstance); #region 会签 @@ -352,9 +345,9 @@ namespace OpenAuth.App throw (new Exception("审核异常,找不到审核节点")); } - flowInstanceOperationHistory.Content = - $"{user.Account}-{DateTime.Now.ToString("yyyy-MM-dd HH:mm")}审批了【{wfruntime.Nodes[canCheckId].name}】" + - $"结果：{(tag.Taged == 1 ? "同意" : "不同意")}，备注：{tag.Description}"; + var content = $"{user.Account}-{DateTime.Now.ToString("yyyy-MM-dd HH:mm")}审批了【{wfruntime.Nodes[canCheckId].name}】" + + $"结果：{(tag.Taged == 1 ? "同意" : "不同意")}，备注：{tag.Description}"; + AddOperationHis(instanceId, tag, content); wfruntime.MakeTagNode(canCheckId, tag); //标记审核节点状态 string res = wfruntime.NodeConfluence(canCheckId, tag); @@ -390,46 +383,7 @@ namespace OpenAuth.App else { - wfruntime.MakeTagNode(wfruntime.currentNodeId, tag); - if (tag.Taged == (int) TagState.Ok) - { - bool canNext = true; - if (wfruntime.currentNode.setInfo.NodeDesignate == Setinfo.RUNTIME_MANY_PARENTS) - { - var roles = _auth.GetCurrentUser().Roles; - //如果是连续多级直属上级且还没到指定的角色，只改变执行人，不到下一个节点 - if (!wfruntime.currentNode.setInfo.NodeDesignateData.roles.Intersect(roles.Select(u =>u.Id)).Any()) - { - canNext = false; - var parentId = _userManagerApp.GetParent(user.Id); - flowInstance.MakerList = parentId; - } - } - - if (canNext) - { - flowInstance.PreviousId = flowInstance.ActivityId; - flowInstance.ActivityId = wfruntime.nextNodeId; - flowInstance.ActivityType = wfruntime.nextNodeType; - flowInstance.ActivityName = wfruntime.nextNode.name; - flowInstance.MakerList = wfruntime.nextNodeType == 4 ? "" : GetNextMakers(wfruntime, request); - flowInstance.IsFinish = (wfruntime.nextNodeType == 4 - ? FlowInstanceStatus.Finished - : FlowInstanceStatus.Running); - } - } - else - { - flowInstance.IsFinish = FlowInstanceStatus.Disagree; //表示该节点不同意 - wfruntime.nextNodeId = "-1"; - wfruntime.nextNodeType = 4; - } - - AddTransHistory(wfruntime); - - flowInstanceOperationHistory.Content = - $"{user.Account}-{DateTime.Now.ToString("yyyy-MM-dd HH:mm")}审批了【{wfruntime.currentNode.name}】" + - $"结果：{(tag.Taged == 1 ? "同意" : "不同意")}，备注：{tag.Description}"; + VerifyNode(request, tag, flowInstance); } #endregion 一般审核 @@ -449,11 +403,9 @@ namespace OpenAuth.App } UnitWork.Update(flowInstance); - UnitWork.Add(flowInstanceOperationHistory); - //给流程创建人发送通知信息 _messageApp.SendMsgTo(flowInstance.CreateUserId, - $"你的流程[{flowInstance.CustomName}]已被{user.Name}处理。处理情况如下:{flowInstanceOperationHistory.Content}"); + $"你的流程[{flowInstance.CustomName}]已被{user.Name}处理。"); UnitWork.Save(); @@ -461,6 +413,64 @@ namespace OpenAuth.App return true; } + /// + /// 普通的节点审批 + /// + private void VerifyNode(VerificationReq request, Tag tag, FlowInstance flowInstance) + { + var user = _auth.GetCurrentUser().User; + FlowRuntime wfruntime = new FlowRuntime(flowInstance); + wfruntime.MakeTagNode(wfruntime.currentNodeId, tag); + if (tag.Taged == (int)TagState.Ok) + { + bool canNext = true; + if (wfruntime.currentNode.setInfo.NodeDesignate == Setinfo.RUNTIME_MANY_PARENTS) + { + var roles = _auth.GetCurrentUser().Roles; + //如果是连续多级直属上级且还没到指定的角色，只改变执行人，不到下一个节点 + if (!wfruntime.currentNode.setInfo.NodeDesignateData.roles.Intersect(roles.Select(u => u.Id)).Any()) + { + canNext = false; + var parentId = _userManagerApp.GetParent(user.Id); + flowInstance.MakerList = parentId; + } + } + + if (canNext) + { + flowInstance.PreviousId = flowInstance.ActivityId; + flowInstance.ActivityId = wfruntime.nextNodeId; + flowInstance.ActivityType = wfruntime.nextNodeType; + flowInstance.ActivityName = wfruntime.nextNode.name; + flowInstance.MakerList = wfruntime.nextNodeType == 4 ? "" : GetNextMakers(wfruntime, request); + flowInstance.IsFinish = (wfruntime.nextNodeType == 4 + ? FlowInstanceStatus.Finished + : FlowInstanceStatus.Running); + } + } + else //审批结果为不同意 + { + flowInstance.IsFinish = FlowInstanceStatus.Disagree; + wfruntime.nextNodeId = "-1"; + wfruntime.nextNodeType = 4; + } + + var content = $"{user.Account}-{DateTime.Now.ToString("yyyy-MM-dd HH:mm")}审批了【{wfruntime.currentNode.name}】" + + $"结果：{(tag.Taged == 1 ? "同意" : "不同意")}，备注：{tag.Description}"; + AddOperationHis(flowInstance.Id, tag, content); + + //如果审批通过，且下一个审批人是自己，则自动审批 + if (tag.Taged == (int)TagState.Ok) + { + if (flowInstance.MakerList != "1" && (!flowInstance.MakerList.Contains(user.Id))) + { + return; + } + VerifyNode(request, tag, flowInstance); + } + + } + //会签时，获取一条会签分支上面是否有用户可审核的节点 private string GetOneForkLineCanCheckNodeId(FlowNode fromForkStartNode, FlowRuntime wfruntime, Tag tag) { @@ -881,6 +891,20 @@ namespace OpenAuth.App TransitionSate = 0 }); } + + private void AddOperationHis(string instanceId, Tag tag, string content) + { + FlowInstanceOperationHistory flowInstanceOperationHistory = new FlowInstanceOperationHistory + { + InstanceId = instanceId, + CreateUserId = tag.UserId, + CreateUserName = tag.UserName, + CreateDate = DateTime.Now, + Content = content + }; //操作记录 + + UnitWork.Add(flowInstanceOperationHistory); + } public List QueryHistories(QueryFlowInstanceHistoryReq request) {