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

回滚到3.4.5

Browse Source
This commit is contained in:
潘飞
2023-04-04 20:19:16 +08:00
parent 92291d66c2
commit 7741e44a80
5 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/Tnb.WorkFlow/Service/FlowTemplateService.cs
View File

@@ -166,11 +166,11 @@ public class FlowTemplateService : IFlowTemplateService, IDynamicApiController,
/// </summary>
/// <param name="input">请求参数.</param>
/// <returns></returns>
[HttpGet("FlowJsonList/{id}")]
[HttpGet("{id}/FlowJsonList")]
public async Task<dynamic> GetFlowJsonList(string id, [FromQuery] FlowTemplateListQuery input)
{
var whereLambda = LinqExpression.And<FlowTemplateJsonEntity>();
whereLambda = whereLambda.And(x => x.DeleteMark == null && x.Id == id);
whereLambda = whereLambda.And(x => x.DeleteMark == null && x.TemplateId == id);
var start = new DateTime();
var end = new DateTime();
if (input.endTime != null && input.startTime != null)
@@ -617,7 +617,7 @@ public class FlowTemplateService : IFlowTemplateService, IDynamicApiController,
await _repository.AsSugarClient().Insertable(visibleList).CallEntityMethod(m => m.Creator()).ExecuteCommandAsync();
#region 功能流程则要回写到对应的表单表中
GetFormIdList(flowTemplateJson.ToObject<List<FlowTemplateModel>>().First().flowTemplateJson, formIdList);
GetFormIdList(flowTemplateJson.ToObject<FlowTemplateJsonModel>(), formIdList);
foreach (var item in formIdList)
{
var formRelationEntity = new FlowFormRelationEntity
@@ -700,7 +700,7 @@ public class FlowTemplateService : IFlowTemplateService, IDynamicApiController,
}
if (visibleList.Count > 0)
await _repository.AsSugarClient().Insertable(visibleList).CallEntityMethod(m => m.Creator()).ExecuteCommandAsync();
GetFormIdList(flowTemplateJson.ToObject<List<FlowTemplateModel>>().First().flowTemplateJson, formIdList);
GetFormIdList(flowTemplateJson.ToObject<FlowTemplateJsonModel>(), formIdList);
foreach (var item in formIdList)
{
var formRelationEntity = new FlowFormRelationEntity
@@ -739,10 +739,8 @@ public class FlowTemplateService : IFlowTemplateService, IDynamicApiController,
var output = new List<FlowEngineVisibleEntity>();
if (josnStr.IsNotEmptyOrNull())
{
// 发起节点属性.
var flow = josnStr.ToObject<List<FlowTemplateModel>>();
var pro = flow.First().flowTemplateJson.properties.ToObject<StartProperties>();
//var pro = josnStr.ToObject<FlowTemplateJsonModel>().properties.ToObject<StartProperties>();
// 发起节点属性.
var pro = josnStr.ToObject<FlowTemplateJsonModel>().properties.ToObject<StartProperties>();
if (pro.initiator.Any())
{
var list = pro.initiator.Select(x => new FlowEngineVisibleEntity() { OperatorId = x, OperatorType = "user" }).ToList();