From bb7bb2675f5c9736726eed26399cfca2c29548e6 Mon Sep 17 00:00:00 2001 From: yubaolee Date: Mon, 26 Dec 2022 20:54:50 +0800 Subject: [PATCH] =?UTF-8?q?fix=20issue=20#I62Y58=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B=E6=97=B6=EF=BC=8C=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=E6=8B=96=E6=8B=BD=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8?= =?UTF-8?q?=EF=BC=88=E6=88=96=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=9A=84=E8=A1=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.App/FlowInstance/FlowInstanceApp.cs | 143 ++++++++++++++----- 1 file changed, 106 insertions(+), 37 deletions(-) diff --git a/OpenAuth.App/FlowInstance/FlowInstanceApp.cs b/OpenAuth.App/FlowInstance/FlowInstanceApp.cs index 61a62f58..ced30b8d 100644 --- a/OpenAuth.App/FlowInstance/FlowInstanceApp.cs +++ b/OpenAuth.App/FlowInstance/FlowInstanceApp.cs @@ -51,7 +51,7 @@ namespace OpenAuth.App public FlowInstanceApp(IUnitWork unitWork, IRepository repository , RevelanceManagerApp app, FlowSchemeApp flowSchemeApp, FormApp formApp, - IHttpClientFactory httpClientFactory, IAuth auth, IServiceProvider serviceProvider, + IHttpClientFactory httpClientFactory, IAuth auth, IServiceProvider serviceProvider, SysMessageApp messageApp, DbExtension dbExtension) : base(unitWork, repository, auth) { @@ -116,7 +116,8 @@ namespace OpenAuth.App flowInstance.PreviousId = wfruntime.currentNodeId; flowInstance.CreateUserId = user.User.Id; flowInstance.CreateUserName = user.User.Account; - flowInstance.MakerList = (wfruntime.GetNextNodeType() != 4 ? GetNextMakers(wfruntime, addFlowInstanceReq) : ""); + flowInstance.MakerList = + (wfruntime.GetNextNodeType() != 4 ? GetNextMakers(wfruntime, addFlowInstanceReq) : ""); flowInstance.IsFinish = (wfruntime.GetNextNodeType() == 4 ? FlowInstanceStatus.Finished : FlowInstanceStatus.Running); @@ -136,26 +137,26 @@ namespace OpenAuth.App { var dbcolumns = _dbExtension.GetDbTableStructure(form.DbName); var json = JsonHelper.Instance.Deserialize(addFlowInstanceReq.FrmData); - var columnstr = string.Empty; //字段 - var valstr = string.Empty; //值字符串 - - + var columnstr = string.Empty; //字段 + var valstr = string.Empty; //值字符串 + + foreach (var column in dbcolumns) { - if (column.ColumnName == "Id" || column.ColumnName=="id") + if (column.ColumnName == "Id" || column.ColumnName == "id") { var options = new IdGeneratorOptions() { Method = 1, WorkerId = 1 }; - + YitIdHelper.SetIdGenerator(options); columnstr += "Id,"; valstr += "'" + YitIdHelper.NextId().ToString() + "',"; continue; } - + //讲流程实例ID赋值到表单数据表中，实现表单记录与流程实例关联 if (column.ColumnName == Define.DEFAULT_FORM_INSTANCE_ID_NAME) { @@ -163,7 +164,7 @@ namespace OpenAuth.App valstr += "'" + flowInstance.Id + "',"; continue; } - + var val = json[column.ColumnName]; if (val == null) { @@ -180,8 +181,8 @@ namespace OpenAuth.App break; } } - - if(val == null) continue; + + if (val == null) continue; columnstr += column.ColumnName + ","; valstr += "'" + val + "',"; } @@ -216,7 +217,7 @@ namespace OpenAuth.App UnitWork.Save(); return true; } - + /// /// 更新流程 /// 更新时可以修改表单内容，可以修改流程基本信息，但不能更换表单模版 @@ -232,12 +233,70 @@ namespace OpenAuth.App throw new Exception("只能修改【草稿】和【驳回】状态的流程"); } + var form = _formApp.Get(flowinstance.FrmId); + + if (form != null) + { + if (form.FrmType == 1) //如果是开发者自定义的表单,更新对应数据库表数据 + { + var t = Type.GetType("OpenAuth.App." + req.DbName + "App"); + ICustomerForm icf = (ICustomerForm) _serviceProvider.GetService(t); + icf.Update(req.Id, req.FrmData); + } + else if (form.FrmType == 2 && !string.IsNullOrEmpty(form.DbName)) //拖拽表单定义了关联数据库 + { + var dbcolumns = _dbExtension.GetDbTableStructure(form.DbName); + var json = JsonHelper.Instance.Deserialize(req.FrmData); + var updatestr = string.Empty; //字段 + + foreach (var column in dbcolumns) + { + if (column.ColumnName == "Id" || column.ColumnName == "id") + { + continue; + } + + //讲流程实例ID赋值到表单数据表中，实现表单记录与流程实例关联 + if (column.ColumnName == Define.DEFAULT_FORM_INSTANCE_ID_NAME) + { + continue; + } + + var val = json[column.ColumnName]; + if (val == null) + { + switch (column.EntityType) + { + case "int": + val = 0; + break; + case "string": + val = ""; + break; + case "DateTime": + val = DateTime.Now.ToString("yyyy-MM-dd"); + break; + } + } + + if (val == null) continue; + updatestr += $"{column.ColumnName} = '{val}',"; + } + + updatestr = updatestr.TrimEnd(','); + var sql = + $"update {form.DbName} set {updatestr} where {Define.DEFAULT_FORM_INSTANCE_ID_NAME}='{req.Id}'"; + UnitWork.ExecuteSql(sql); + } + } + flowinstance.Description = req.Description; flowinstance.Code = req.Code; flowinstance.FrmData = req.FrmData; flowinstance.DbName = req.DbName; flowinstance.CustomName = req.CustomName; - Repository.Update(flowinstance); + UnitWork.Update(flowinstance); + UnitWork.Save(); } /// @@ -249,7 +308,7 @@ namespace OpenAuth.App { var user = _auth.GetCurrentUser().User; var instanceId = request.FlowInstanceId; - + var tag = new Tag { UserName = user.Name, @@ -257,14 +316,14 @@ namespace OpenAuth.App Description = request.VerificationOpinion, Taged = Int32.Parse(request.VerificationFinally) }; - + FlowInstance flowInstance = Get(instanceId); - + if (flowInstance.MakerList != "1" && !flowInstance.MakerList.Contains(user.Id)) { throw new Exception("当前用户没有审批该节点权限"); } - + FlowInstanceOperationHistory flowInstanceOperationHistory = new FlowInstanceOperationHistory { InstanceId = instanceId, @@ -353,7 +412,7 @@ namespace OpenAuth.App wfruntime.nextNodeId = "-1"; wfruntime.nextNodeType = 4; } - + AddTransHistory(wfruntime); flowInstanceOperationHistory.Content = "【" + wfruntime.currentNode.name @@ -369,12 +428,12 @@ namespace OpenAuth.App if (!string.IsNullOrEmpty(request.FrmData)) { flowInstance.FrmData = request.FrmData; - + if (flowInstance.FrmType == 1) //如果是开发者自定义的表单,更新对应数据库表数据 { var t = Type.GetType("OpenAuth.App." + flowInstance.DbName + "App"); ICustomerForm icf = (ICustomerForm) _serviceProvider.GetService(t); - icf.Update(flowInstance.Id,flowInstance.FrmData); + icf.Update(flowInstance.Id, flowInstance.FrmData); } } @@ -382,8 +441,8 @@ namespace OpenAuth.App UnitWork.Add(flowInstanceOperationHistory); //给流程创建人发送通知信息 - _messageApp.SendMsgTo(flowInstance.CreateUserId, - $"你的流程[{flowInstance.CustomName}]已被{user.Name}处理。处理情况如下:{flowInstanceOperationHistory.Content}"); + _messageApp.SendMsgTo(flowInstance.CreateUserId, + $"你的流程[{flowInstance.CustomName}]已被{user.Name}处理。处理情况如下:{flowInstanceOperationHistory.Content}"); UnitWork.Save(); @@ -468,9 +527,9 @@ namespace OpenAuth.App + "】【" + DateTime.Now.ToString("yyyy-MM-dd HH:mm") + "】驳回,备注：" + reqest.VerificationOpinion }); - + //给流程创建人发送通知信息 - _messageApp.SendMsgTo(flowInstance.CreateUserId, + _messageApp.SendMsgTo(flowInstance.CreateUserId, $"你的流程[{flowInstance.CustomName}]已被{user.Name}驳回。备注信息:{reqest.VerificationOpinion}"); UnitWork.Save(); @@ -489,7 +548,7 @@ namespace OpenAuth.App /// 一般用于本节点审核完成后，修改流程实例的当前执行人，可以做到通知等功能 /// /// - private string GetNextMakers(FlowRuntime wfruntime, NodeDesignateReq request=null) + private string GetNextMakers(FlowRuntime wfruntime, NodeDesignateReq request = null) { string makerList = ""; if (wfruntime.nextNodeId == "-1") @@ -502,20 +561,24 @@ namespace OpenAuth.App makerList = GetForkNodeMakers(wfruntime, wfruntime.nextNodeId); } else if (wfruntime.nextNode.setInfo.NodeDesignate == Setinfo.RUNTIME_SPECIAL_ROLE) - { //如果是运行时指定角色 + { + //如果是运行时指定角色 if (wfruntime.nextNode.setInfo.NodeDesignate != request.NodeDesignateType) { throw new Exception("前端提交的节点权限类型异常，请检查流程"); } + var users = _revelanceApp.Get(Define.USERROLE, false, request.NodeDesignates); makerList = GenericHelpers.ArrayToString(users, makerList); } else if (wfruntime.nextNode.setInfo.NodeDesignate == Setinfo.RUNTIME_SPECIAL_USER) - { //如果是运行时指定用户 + { + //如果是运行时指定用户 if (wfruntime.nextNode.setInfo.NodeDesignate != request.NodeDesignateType) { throw new Exception("前端提交的节点权限类型异常，请检查流程"); } + makerList = GenericHelpers.ArrayToString(request.NodeDesignates, makerList); } else @@ -647,6 +710,7 @@ namespace OpenAuth.App { CheckNodeDesignate(request); } + bool isReject = TagState.Reject.Equals((TagState) Int32.Parse(request.VerificationFinally)); if (isReject) //驳回 { @@ -680,18 +744,19 @@ namespace OpenAuth.App public FlowVerificationResp GetForVerification(string id) { var flowinstance = Get(id); - var resp =flowinstance.MapTo(); + var resp = flowinstance.MapTo(); var runtime = new FlowRuntime(flowinstance); - if (runtime.currentNode != null && runtime.currentNode.setInfo !=null) + if (runtime.currentNode != null && runtime.currentNode.setInfo != null) { resp.CanWriteFormItemIds = runtime.currentNode.setInfo.CanWriteFormItemIds; } - - if (runtime.nextNode != null && runtime.nextNode.setInfo !=null && runtime.nextNodeType != 4) + + if (runtime.nextNode != null && runtime.nextNode.setInfo != null && runtime.nextNodeType != 4) { resp.NextNodeDesignateType = runtime.nextNode.setInfo.NodeDesignate; resp.CanWriteFormItemIds = runtime.currentNode.setInfo.CanWriteFormItemIds; } + return resp; } @@ -715,7 +780,8 @@ namespace OpenAuth.App result.count = await UnitWork.Find(waitExp).CountAsync(); - result.data =await UnitWork.Find(request.page, request.limit, "CreateDate descending", waitExp).ToListAsync(); + result.data = await UnitWork.Find(request.page, request.limit, "CreateDate descending", waitExp) + .ToListAsync(); } else if (request.type == "disposed") //已办事项（即我参与过的流程） { @@ -734,7 +800,7 @@ namespace OpenAuth.App result.data = await query.OrderByDescending(u => u.CreateDate) .Skip((request.page - 1) * request.limit) .Take(request.limit).ToListAsync(); - result.count =await instances.CountAsync(); + result.count = await instances.CountAsync(); } else //我的流程 { @@ -746,7 +812,7 @@ namespace OpenAuth.App myFlowExp = myFlowExp.And(t => t.CustomName.Contains(request.key)); } - result.count =await UnitWork.Find(myFlowExp).CountAsync(); + result.count = await UnitWork.Find(myFlowExp).CountAsync(); result.data = await UnitWork.Find(request.page, request.limit, "CreateDate descending", myFlowExp).ToListAsync(); } @@ -789,7 +855,7 @@ namespace OpenAuth.App { var user = _auth.GetCurrentUser().User; FlowInstance flowInstance = Get(request.FlowInstanceId); - if (flowInstance.IsFinish == FlowInstanceStatus.Draft + if (flowInstance.IsFinish == FlowInstanceStatus.Draft || flowInstance.IsFinish == FlowInstanceStatus.Finished) { throw new Exception("当前流程状态不能召回"); @@ -818,7 +884,7 @@ namespace OpenAuth.App CreateUserId = user.Id, CreateUserName = user.Name, CreateDate = DateTime.Now, - Content = $"【撤销】由{user.Name}撤销,备注：{request.Description}" + Content = $"【撤销】由{user.Name}撤销,备注：{request.Description}" }); UnitWork.Save(); @@ -833,6 +899,7 @@ namespace OpenAuth.App { throw new Exception("当前流程不是草稿状态，不能启动"); } + var wfruntime = new FlowRuntime(flowInstance); var user = _auth.GetCurrentUser(); @@ -843,6 +910,7 @@ namespace OpenAuth.App } #region 根据运行实例改变当前节点状态 + flowInstance.ActivityId = wfruntime.nextNodeId; flowInstance.ActivityType = wfruntime.GetNextNodeType(); flowInstance.ActivityName = wfruntime.nextNode.name; @@ -855,6 +923,7 @@ namespace OpenAuth.App : FlowInstanceStatus.Running); UnitWork.Update(flowInstance); + #endregion 根据运行实例改变当前节点状态 #region 流程操作记录