wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除引用common.props

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:35:59 +08:00
parent 6a2154edd9
commit c6b8dfc861
810 changed files with 3910 additions and 6695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/Tnb.WorkFlow/Service/FlowBeforeService.cs
View File

@@ -194,7 +194,7 @@ public class FlowBeforeService : IDynamicApiController, ITransient
var flowJson = _flowTaskRepository.GetFlowTemplateJsonInfo(x => x.Id == item.FlowId && x.DeleteMark == null);
if (flowJson.IsNotEmptyOrNull())
{
output.Add(new { id = flowJson.Id, fullName =string.Format("{0}(v{1})", flowJson.FullName, flowJson.Version), flowTemplateJson= flowJson.FlowTemplateJson });
output.Add(new { id = flowJson.Id, fullName = string.Format("{0}(v{1})", flowJson.FullName, flowJson.Version), flowTemplateJson = flowJson.FlowTemplateJson });
}
}
return output.Distinct();
@@ -304,7 +304,7 @@ public class FlowBeforeService : IDynamicApiController, ITransient
[HttpGet("Suspend/{taskId}")]
public async Task<dynamic> Suspend(string taskId)
{
return await _flowTaskRepository.AnyFlowTask(x => x.ParentId == taskId && x.IsAsync == 1 && x.DeleteMark == null);
return await _flowTaskRepository.AnyFlowTask(x => x.ParentId == taskId && x.IsAsync == 1 && x.DeleteMark == null);
}
#endregion
@@ -491,7 +491,7 @@ public class FlowBeforeService : IDynamicApiController, ITransient
/// <param name="flowHandleModel">审批参数.</param>
/// <returns></returns>
[HttpPost("Suspend/{taskId}")]
public async Task Suspend(string taskId,[FromBody] FlowHandleModel flowHandleModel)
public async Task Suspend(string taskId, [FromBody] FlowHandleModel flowHandleModel)
{
var flowTaskParamter = await _flowTaskRepository.GetTaskParamterByTaskId(taskId, flowHandleModel);
await _flowTaskManager.Suspend(flowTaskParamter);