|
@@ -46,8 +46,9 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
private readonly ISessionContext _sessionContext;
|
|
|
private readonly ISystemSettingCacheManager _systemSettingCacheManager;
|
|
|
private readonly IRepository<OrderSpecialDetail> _orderSpecialDetailRepository;
|
|
|
+ private readonly IRepository<WorkflowTrace> _workflowTraceRepository;
|
|
|
|
|
|
- public BiOrderController(
|
|
|
+ public BiOrderController(
|
|
|
IOrderRepository orderRepository,
|
|
|
IRepository<Hotspot> hotspotTypeRepository,
|
|
|
ISystemDicDataCacheManager sysDicDataCacheManager,
|
|
@@ -63,8 +64,9 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
IRepository<AiOrderVisitDetail> aiOrderVisitDetailRepository,
|
|
|
ISessionContext sessionContext,
|
|
|
ISystemSettingCacheManager systemSettingCacheManager,
|
|
|
- IRepository<OrderSpecialDetail> orderSpecialDetailRepository
|
|
|
- )
|
|
|
+ IRepository<OrderSpecialDetail> orderSpecialDetailRepository,
|
|
|
+ IRepository<WorkflowTrace> workflowTraceRepository
|
|
|
+ )
|
|
|
{
|
|
|
_orderRepository = orderRepository;
|
|
|
_hotspotTypeRepository = hotspotTypeRepository;
|
|
@@ -82,8 +84,9 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
_sessionContext = sessionContext;
|
|
|
_systemSettingCacheManager = systemSettingCacheManager;
|
|
|
_orderSpecialDetailRepository = orderSpecialDetailRepository;
|
|
|
+ _workflowTraceRepository = workflowTraceRepository;
|
|
|
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
//public async Task OrgDataListDetail([FromQuery] OrgDataListDetailRequest dto)
|
|
|
//{
|
|
@@ -1799,24 +1802,20 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
return rsp;
|
|
|
}
|
|
|
|
|
|
- /// <summary>
|
|
|
- /// 派单量统计// TODO
|
|
|
- /// </summary>
|
|
|
- /// <param name="dto"></param>
|
|
|
- /// <returns></returns>
|
|
|
- public async Task<PagedDto<BiOrderSendVo>> SendOrderReport([FromQuery] QuerySendOrderRequest dto)
|
|
|
- {
|
|
|
- if (!dto.StartTime.HasValue || !dto.EndTime.HasValue)
|
|
|
- throw UserFriendlyException.SameMessage("请选择时间!");
|
|
|
- var (total, items) = await _orderSpecialDetailRepository.Queryable()
|
|
|
- .Includes(x => x.OrderSpecial, s => s.Order)
|
|
|
- .WhereIF(!string.IsNullOrEmpty(dto.UserName), x => x.OrgName.Contains(dto.UserName!))
|
|
|
- .Where(x => x.OrderSpecial.ESpecialType == ESpecialType.ReTransact)
|
|
|
- .Where(x => x.OrderSpecial.CreationTime >= dto.StartTime)
|
|
|
- .Where(x => x.OrderSpecial.CreationTime <= dto.EndTime)
|
|
|
- .ToPagedListAsync(dto, HttpContext.RequestAborted);
|
|
|
- return new PagedDto<BiOrderSendVo>(total, _mapper.Map<IReadOnlyList<BiOrderSendVo>>(items)); ;
|
|
|
- }
|
|
|
+ // /// <summary>
|
|
|
+ // /// 派单量统计// TODO
|
|
|
+ // /// </summary>
|
|
|
+ // /// <param name="dto"></param>
|
|
|
+ // /// <returns></returns>
|
|
|
+ // public async Task<PagedDto<BiOrderSendVo>> SendOrderReport([FromQuery] QuerySendOrderRequest dto)
|
|
|
+ // {
|
|
|
+ // if (!dto.StartTime.HasValue || !dto.EndTime.HasValue)
|
|
|
+ // throw UserFriendlyException.SameMessage("请选择时间!");
|
|
|
+ // var (total, items) = await _workflowTraceRepository.Queryable()
|
|
|
+ // .LeftJoin<Workflow>((x,w)=>x.)
|
|
|
+
|
|
|
+ // return new PagedDto<BiOrderSendVo>(total, _mapper.Map<IReadOnlyList<BiOrderSendVo>>(items)); ;
|
|
|
+ //}
|
|
|
|
|
|
|
|
|
}
|