|
@@ -3549,6 +3549,8 @@ public class OrderController : BaseController
|
|
startDto.Title = order.Title;
|
|
startDto.Title = order.Title;
|
|
var startStep = await _workflowDomainService.StartAsync(startDto, order.Id, order.ExpiredTime, HttpContext.RequestAborted);
|
|
var startStep = await _workflowDomainService.StartAsync(startDto, order.Id, order.ExpiredTime, HttpContext.RequestAborted);
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
await HandleOrderAsync(order, startStep, dto.Data, dto.Workflow, HttpContext.RequestAborted);
|
|
await HandleOrderAsync(order, startStep, dto.Data, dto.Workflow, HttpContext.RequestAborted);
|
|
}
|
|
}
|
|
catch (Exception e)
|
|
catch (Exception e)
|
|
@@ -3660,6 +3662,17 @@ public class OrderController : BaseController
|
|
if (!orderHandleFlowDto.CrossSteps.Any())
|
|
if (!orderHandleFlowDto.CrossSteps.Any())
|
|
throw new UserFriendlyException("跨级指派参数异常");
|
|
throw new UserFriendlyException("跨级指派参数异常");
|
|
|
|
|
|
|
|
+ //todo 1. 办理startStep 得到nextSteps 2. 利用crossSteps参数逐级办理unhandlSteps
|
|
|
|
+
|
|
|
|
+ orderHandleFlowDto.CrossSteps = orderHandleFlowDto.CrossSteps.OrderBy(d => d.Sort).ToList();
|
|
|
|
+ for (int i = 0; i < orderHandleFlowDto.CrossSteps.Count; i++)
|
|
|
|
+ {
|
|
|
|
+ var unhandleStep = orderHandleFlowDto.CrossSteps[i];
|
|
|
|
+
|
|
|
|
+ await _workflowDomainService.NextAsync(nextflowDto, expiredTime, cancellationToken);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ //
|
|
var orgIds = orderHandleFlowDto.CrossOrgIds;
|
|
var orgIds = orderHandleFlowDto.CrossOrgIds;
|
|
orgIds.Add(workflowDto.NextHandlers.First().OrgId);
|
|
orgIds.Add(workflowDto.NextHandlers.First().OrgId);
|
|
var orgs = await _organizeRepository.Queryable()
|
|
var orgs = await _organizeRepository.Queryable()
|