|
|
@@ -2378,34 +2378,6 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
/// </summary>
|
|
|
private bool HasStepsAllHandled(List<WorkflowStep> steps, WorkflowStep countersignStartStep)
|
|
|
{
|
|
|
- //_logger.LogWarning($"wfId: {countersignStartStep.WorkflowId}, StartCountersignId: {countersignStartStep.StartCountersignId}");
|
|
|
- //var innerSteps = steps.Where(d => d.CountersignId == countersignStartStep.StartCountersignId).ToList();
|
|
|
- //_logger.LogWarning($"wfId: {countersignStartStep.WorkflowId}, innerSteps count: {innerSteps.Count}");
|
|
|
-
|
|
|
- //if (innerSteps.Any(d => d.Status != EWorkflowStepStatus.Handled)) return false;
|
|
|
- //var csStartSteps = innerSteps.Where(d=>d.IsStartCountersign).ToList();
|
|
|
- //if (csStartSteps.Any())
|
|
|
- //{
|
|
|
- // _logger.LogWarning($"wfId: {countersignStartStep.WorkflowId}, csStartSteps count: {csStartSteps.Count}");
|
|
|
- // foreach (var csStartStep in csStartSteps)
|
|
|
- // {
|
|
|
- // return HasStepsAllHandled(steps, csStartStep);
|
|
|
- // }
|
|
|
- //}
|
|
|
- ////
|
|
|
- //// foreach (var step in innerSteps)
|
|
|
- //// {
|
|
|
- //// if (step.Status != EWorkflowStepStatus.Handled)
|
|
|
- //// {
|
|
|
- //// _logger.LogWarning($"wfId: {countersignStartStep.WorkflowId}, step Id: {step.Id}, status: {step.Status}, result false");
|
|
|
- //// return false;
|
|
|
- //// }
|
|
|
- ////
|
|
|
- //// if (step.IsStartCountersign)
|
|
|
- //// return HasStepsAllHandled(steps, step);
|
|
|
- //// }
|
|
|
- //_logger.LogWarning($"wfId: {countersignStartStep.WorkflowId}, result true");
|
|
|
- //return true;
|
|
|
var countersignSteps = GetStepsCascade(steps, countersignStartStep);
|
|
|
return countersignSteps.All(d => d.Status == EWorkflowStepStatus.Handled);
|
|
|
}
|
xf