|
@@ -602,12 +602,12 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
var unhandlePreviousTrace = workflow.Traces.FirstOrDefault(d =>
|
|
|
d.Status is not EWorkflowStepStatus.Handled
|
|
|
);
|
|
|
-
|
|
|
+
|
|
|
var unCompletedCountersign = workflow.Countersigns
|
|
|
.FirstOrDefault(d => !d.IsCompleted() && d.StarterOrgId == orgId);
|
|
|
if (unCompletedCountersign is null)
|
|
|
return (workflow, null, canHandle, canPrevious, unhandlePreviousTrace);
|
|
|
-
|
|
|
+
|
|
|
//var existCountersignEndStep = workflow.Steps.Exists(d =>
|
|
|
// d.IsCountersignEndStep && d.CountersignStartStepId == unCompletedCountersign.StartStepId);
|
|
|
//return (workflow, existCountersignEndStep ? null : unCompletedCountersign.Id, canPrevious);
|
|
@@ -1680,7 +1680,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
/// 特提至中心(优先派单组其次坐席)
|
|
|
/// </summary>
|
|
|
/// <returns>true 派单组 false 话务部</returns>
|
|
|
- public async Task<bool> RecallToCenterFirstToSendAsync(string workflowId, string opinion, bool isOrderFiled,
|
|
|
+ public async Task<(bool, Workflow workflow)> RecallToCenterFirstToSendAsync(string workflowId, string opinion, bool isOrderFiled,
|
|
|
DateTime? expiredTime, List<FlowStepHandler>? handlers, CancellationToken cancellationToken)
|
|
|
{
|
|
|
bool isPaiDan = true;
|
|
@@ -1763,7 +1763,7 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
isPaiDan = false;
|
|
|
}
|
|
|
|
|
|
- return isPaiDan;
|
|
|
+ return (new(isPaiDan, workflow));
|
|
|
}
|
|
|
|
|
|
//private async Task RecallToTargetStepAsync(Workflow workflow, WorkflowStep targetStep, string opinion, ISessionContext current,
|