|
@@ -906,7 +906,7 @@ ICallApplication callApplication,
|
|
_logger.LogWarning($"推送数据共:{provinceNos.Count}");
|
|
_logger.LogWarning($"推送数据共:{provinceNos.Count}");
|
|
|
|
|
|
var unpublishOrders = await _orderRepository.Queryable()
|
|
var unpublishOrders = await _orderRepository.Queryable()
|
|
- .Includes(d => d.Workflow, w => w.Steps.Where(s => s.StepType == EStepType.End))
|
|
|
|
|
|
+ //.Includes(d => d.Workflow, w => w.Traces)
|
|
.Where(d => provinceNos.Contains(d.ProvinceNo) &&
|
|
.Where(d => provinceNos.Contains(d.ProvinceNo) &&
|
|
!string.IsNullOrEmpty(d.ProvinceNo) &&
|
|
!string.IsNullOrEmpty(d.ProvinceNo) &&
|
|
d.Status >= EOrderStatus.Filed)
|
|
d.Status >= EOrderStatus.Filed)
|
|
@@ -916,10 +916,13 @@ ICallApplication callApplication,
|
|
|
|
|
|
foreach (var order in unpublishOrders)
|
|
foreach (var order in unpublishOrders)
|
|
{
|
|
{
|
|
|
|
+ var trace = await _workflowTraceRepository.Queryable()
|
|
|
|
+ .FirstAsync(d => d.WorkflowId == order.WorkflowId && d.StepType == EStepType.End,
|
|
|
|
+ HttpContext.RequestAborted);
|
|
var orderFlowDto = new OrderFlowDto
|
|
var orderFlowDto = new OrderFlowDto
|
|
{
|
|
{
|
|
Order = _mapper.Map<OrderDto>(order),
|
|
Order = _mapper.Map<OrderDto>(order),
|
|
- WorkflowTrace = _mapper.Map<WorkflowTraceDto>(order.Workflow.Traces.First())
|
|
|
|
|
|
+ WorkflowTrace = _mapper.Map<WorkflowTraceDto>(trace)
|
|
};
|
|
};
|
|
|
|
|
|
if (order.SourceChannelCode == AppDefaults.SourceChannel.DianHua &&
|
|
if (order.SourceChannelCode == AppDefaults.SourceChannel.DianHua &&
|