|
@@ -1863,7 +1863,7 @@ public class OrderController : BaseController
|
|
|
handleStatuses = dto.IsHandled.Value
|
|
handleStatuses = dto.IsHandled.Value
|
|
|
? new[] { EWorkflowStepStatus.Handled }
|
|
? new[] { EWorkflowStepStatus.Handled }
|
|
|
: new[] { EWorkflowStepStatus.WaitForAccept, EWorkflowStepStatus.WaitForHandle };
|
|
: new[] { EWorkflowStepStatus.WaitForAccept, EWorkflowStepStatus.WaitForHandle };
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
RefAsync<int> total = 0;
|
|
RefAsync<int> total = 0;
|
|
|
var dtos = await _workflowStepRepository.Queryable()
|
|
var dtos = await _workflowStepRepository.Queryable()
|
|
|
.InnerJoin<Workflow>((s, w) => s.WorkflowId == w.Id)
|
|
.InnerJoin<Workflow>((s, w) => s.WorkflowId == w.Id)
|
|
@@ -1877,6 +1877,8 @@ public class OrderController : BaseController
|
|
|
.OrderByDescending((s) => s.StepExpiredTime)
|
|
.OrderByDescending((s) => s.StepExpiredTime)
|
|
|
.Select((s, w, o) => new OrderWaitedDto
|
|
.Select((s, w, o) => new OrderWaitedDto
|
|
|
{
|
|
{
|
|
|
|
|
+ Id = o.Id,
|
|
|
|
|
+ ExpiredTime = o.ExpiredTime,
|
|
|
StepExpiredTime = s.StepExpiredTime,
|
|
StepExpiredTime = s.StepExpiredTime,
|
|
|
Status = o.Status
|
|
Status = o.Status
|
|
|
}, true)
|
|
}, true)
|
xf