|
@@ -181,10 +181,10 @@ public class OrderDelayApplication : IOrderDelayApplication, IScopeDependency
|
|
|
/// <returns></returns>
|
|
|
public async Task BatchReviewAsync(BatchOrderDelayReviewRequest request, CancellationToken cancellation)
|
|
|
{
|
|
|
- var delayIds = request.DelayWithStepIds.Select(d => d.DelayId).Distinct().ToList();
|
|
|
- var delays = await _orderDelayRepository.Queryable()
|
|
|
- .Where(d => delayIds.Contains(d.Id))
|
|
|
- .ToListAsync(cancellation);
|
|
|
+ //var delayIds = request.DelayWithStepIds.Select(d => d.DelayId).Distinct().ToList();
|
|
|
+ //var delays = await _orderDelayRepository.Queryable()
|
|
|
+ // .Where(d => delayIds.Contains(d.Id))
|
|
|
+ // .ToListAsync(cancellation);
|
|
|
|
|
|
var apptaskItems = new List<AddApptaskItemRequest>();
|
|
|
var req = new OrderDelayReviewWithSessionRequest
|
|
@@ -193,12 +193,13 @@ public class OrderDelayApplication : IOrderDelayApplication, IScopeDependency
|
|
|
IsPass = request.IsPass,
|
|
|
NextWorkflow = request.NextWorkflow
|
|
|
};
|
|
|
- foreach (var delay in delays)
|
|
|
+ foreach (var delay in request.DelayWithStepIds)
|
|
|
{
|
|
|
- req.NextWorkflow.StepId = request.DelayWithStepIds.First(d => d.DelayId == delay.Id).StepId;
|
|
|
+ req.NextWorkflow.WorkflowId = delay.WorkflowId;
|
|
|
+ req.NextWorkflow.StepId = delay.StepId;//request.DelayWithStepIds.First(d => d.DelayId == delay.Id).StepId;
|
|
|
apptaskItems.Add(new AddApptaskItemRequest
|
|
|
{
|
|
|
- BusinessId = delay.Id,
|
|
|
+ BusinessId = delay.DelayId,
|
|
|
TaskParams = req
|
|
|
});
|
|
|
}
|
|
@@ -212,12 +213,17 @@ public class OrderDelayApplication : IOrderDelayApplication, IScopeDependency
|
|
|
|
|
|
if (!string.IsNullOrEmpty(taskId))
|
|
|
{
|
|
|
- foreach (var orderDelay in delays)
|
|
|
- {
|
|
|
- orderDelay.DelayState = EDelayState.BatchProcessing;
|
|
|
- }
|
|
|
- await _orderDelayRepository.Updateable(delays)
|
|
|
- .UpdateColumns(d=>new {d.DelayState})
|
|
|
+ //foreach (var orderDelay in delays)
|
|
|
+ //{
|
|
|
+ // orderDelay.DelayState = EDelayState.BatchProcessing;
|
|
|
+ //}
|
|
|
+ //await _orderDelayRepository.Updateable(delays)
|
|
|
+ // .UpdateColumns(d => new { d.DelayState })
|
|
|
+ // .ExecuteCommandAsync(cancellation);
|
|
|
+ var delayIds = request.DelayWithStepIds.Select(d => d.DelayId).ToList();
|
|
|
+ await _orderDelayRepository.Updateable()
|
|
|
+ .SetColumns(d => d.DelayState == EDelayState.BatchProcessing)
|
|
|
+ .Where(d => delayIds.Contains(d.Id))
|
|
|
.ExecuteCommandAsync(cancellation);
|
|
|
}
|
|
|
}
|