|
@@ -29,7 +29,7 @@ namespace Hotline.Api.Controllers
|
|
private readonly ISessionContext _sessionContext;
|
|
private readonly ISessionContext _sessionContext;
|
|
private readonly IRepository<TrCallRecord> _trCallRecordRepository;
|
|
private readonly IRepository<TrCallRecord> _trCallRecordRepository;
|
|
private readonly IOrderRepository _orderRepository;
|
|
private readonly IOrderRepository _orderRepository;
|
|
- private readonly IRepository<WorkflowCountersign> _workflowCountersignRepository;
|
|
|
|
|
|
+ private readonly IOrderDelayRepository _orderDelayRepository;
|
|
|
|
|
|
public CommonPController(
|
|
public CommonPController(
|
|
ISystemCommonOpinionDomainService commonOpinionDomainService,
|
|
ISystemCommonOpinionDomainService commonOpinionDomainService,
|
|
@@ -38,7 +38,7 @@ namespace Hotline.Api.Controllers
|
|
IRepository<TrCallRecord> trCallRecordRepository,
|
|
IRepository<TrCallRecord> trCallRecordRepository,
|
|
IOrderRepository orderRepository,
|
|
IOrderRepository orderRepository,
|
|
IMapper mapper,
|
|
IMapper mapper,
|
|
- IRepository<WorkflowCountersign> workflowCountersignRepository)
|
|
|
|
|
|
+ IOrderDelayRepository orderDelayRepository)
|
|
{
|
|
{
|
|
_commonOpinionDomainService = commonOpinionDomainService;
|
|
_commonOpinionDomainService = commonOpinionDomainService;
|
|
_systemAreaDomainService= systemAreaDomainService;
|
|
_systemAreaDomainService= systemAreaDomainService;
|
|
@@ -46,7 +46,7 @@ namespace Hotline.Api.Controllers
|
|
_sessionContext = sessionContext;
|
|
_sessionContext = sessionContext;
|
|
_trCallRecordRepository = trCallRecordRepository;
|
|
_trCallRecordRepository = trCallRecordRepository;
|
|
_orderRepository = orderRepository;
|
|
_orderRepository = orderRepository;
|
|
- _workflowCountersignRepository = workflowCountersignRepository;
|
|
|
|
|
|
+ _orderDelayRepository = orderDelayRepository;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -104,15 +104,16 @@ namespace Hotline.Api.Controllers
|
|
{
|
|
{
|
|
aboutExpire = SqlFunc.AggregateSum(SqlFunc.IIF(time > o.NearlyExpiredTime!.Value && time < o.ExpiredTime!.Value, 1, 0)),
|
|
aboutExpire = SqlFunc.AggregateSum(SqlFunc.IIF(time > o.NearlyExpiredTime!.Value && time < o.ExpiredTime!.Value, 1, 0)),
|
|
havExpired = SqlFunc.AggregateSum(SqlFunc.IIF( time > o.ExpiredTime!.Value, 1, 0)),
|
|
havExpired = SqlFunc.AggregateSum(SqlFunc.IIF( time > o.ExpiredTime!.Value, 1, 0)),
|
|
|
|
+ countersignHandle = SqlFunc.AggregateSum(SqlFunc.IIF(o.CounterSignType.HasValue, 1, 0)),
|
|
|
|
|
|
}).FirstAsync();
|
|
}).FirstAsync();
|
|
var aboutExpire = order?.aboutExpire ?? 0;
|
|
var aboutExpire = order?.aboutExpire ?? 0;
|
|
var havExpired = order?.havExpired ?? 0;
|
|
var havExpired = order?.havExpired ?? 0;
|
|
|
|
+ var countersignHandle = order?.countersignHandle ?? 0;
|
|
|
|
|
|
- //var Countersign = await _
|
|
|
|
|
|
|
|
|
|
|
|
- return new { AboutExpire = aboutExpire, HavExpired = havExpired, CountersignHandle = "aa", ScreenAudit = "aa", Delay = "aa", ScreenHandle = "aa" };
|
|
|
|
|
|
+ return new { AboutExpire = aboutExpire, HavExpired = havExpired, CountersignHandle = countersignHandle, ScreenAudit = "aa", Delay = "aa", ScreenHandle = "aa" };
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|