|
@@ -5636,8 +5636,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
UserName = x.HandlerName,
|
|
UserName = x.HandlerName,
|
|
StepName = x.Name,
|
|
StepName = x.Name,
|
|
SendOrderNum = 0,
|
|
SendOrderNum = 0,
|
|
- ReSendOrderNum =0,
|
|
|
|
NoSendOrderNum = SqlFunc.AggregateDistinctCount(w.ExternalId),
|
|
NoSendOrderNum = SqlFunc.AggregateDistinctCount(w.ExternalId),
|
|
|
|
+ ReSendOrderNum =0,
|
|
});
|
|
});
|
|
|
|
|
|
var items2 = _workflowTraceRepository.Queryable()
|
|
var items2 = _workflowTraceRepository.Queryable()
|
|
@@ -5664,7 +5664,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
ReSendOrderNum = SqlFunc.AggregateDistinctCount(wt.ExternalId),
|
|
ReSendOrderNum = SqlFunc.AggregateDistinctCount(wt.ExternalId),
|
|
});
|
|
});
|
|
|
|
|
|
- var items = await _orderRepository.UnionAll(itemsHandled, itemsNo, itemsHandled)
|
|
|
|
|
|
+ var items = await _orderRepository.UnionAll(itemsHandled, itemsNo, items2)
|
|
.GroupBy(x => new { x.UserId, x.UserName, x.StepName })
|
|
.GroupBy(x => new { x.UserId, x.UserName, x.StepName })
|
|
.Select(x => new BiOrderSendVo
|
|
.Select(x => new BiOrderSendVo
|
|
{
|
|
{
|