|
@@ -57,8 +57,8 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
[HttpGet("org_data_list")]
|
|
|
public async Task<PagedDto<OrderBiOrgDataListVo>> OrgDataList([FromQuery] ReportPagedRequest dto)
|
|
|
{
|
|
|
- //TODO 会签统计待处理 目前缺少关联关系
|
|
|
- var queryOrder = _orderRepository.Queryable(false, false, false)
|
|
|
+ if (!dto.StartTime.HasValue || !dto.EndTime.HasValue) throw UserFriendlyException.SameMessage("请选择时间!");
|
|
|
+ var queryOrder = _orderRepository.Queryable(false, false, false)
|
|
|
.LeftJoin<SystemOrganize>((x, o) => x.ActualHandleOrgCode == o.Id)
|
|
|
.WhereIF(dto.StartTime.HasValue, (x, o) => x.CreationTime >= dto.StartTime)
|
|
|
.WhereIF(dto.EndTime.HasValue, (x, o) => x.CreationTime <= dto.EndTime)
|
|
@@ -121,7 +121,8 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
[HttpGet("centre_data_list")]
|
|
|
public async Task<PagedDto<OrderBiCentreDataListVo>> CentreDataList([FromQuery] ReportPagedRequest dto)
|
|
|
{
|
|
|
- var query = _orderRepository.Queryable(false, false, false)
|
|
|
+ if (!dto.StartTime.HasValue || !dto.EndTime.HasValue) throw UserFriendlyException.SameMessage("请选择时间!");
|
|
|
+ var query = _orderRepository.Queryable(false, false, false)
|
|
|
.WhereIF(dto.StartTime.HasValue, x => x.CreationTime >= dto.StartTime)
|
|
|
.WhereIF(dto.EndTime.HasValue, x => x.CreationTime <= dto.EndTime)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.AcceptorName.Contains(dto.Keyword!))
|
|
@@ -166,7 +167,8 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
[HttpGet("hotspot_data_list")]
|
|
|
public async Task<PagedDto<HotspotDataLsitVo>> HotspotDataLsit([FromQuery] HotspotReportPagedRequest dto)
|
|
|
{
|
|
|
- var query = _hotspotTypeRepository.Queryable(false, true)
|
|
|
+ if (!dto.StartTime.HasValue || !dto.EndTime.HasValue) throw UserFriendlyException.SameMessage("请选择时间!");
|
|
|
+ var query = _hotspotTypeRepository.Queryable(false, true)
|
|
|
.LeftJoin<Order>((x, o) => o.HotspotSpliceName != null && (x.HotSpotFullName == o.HotspotSpliceName || o.HotspotSpliceName.Contains(x.HotSpotFullName)) && o.IsDeleted == false)
|
|
|
.WhereIF(dto.StartTime.HasValue, (x, o) => o.CreationTime >= dto.StartTime)
|
|
|
.WhereIF(dto.EndTime.HasValue, (x, o) => o.CreationTime <= dto.EndTime)
|
|
@@ -193,8 +195,8 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
[HttpGet("visit-nosatisfied")]
|
|
|
public async Task<object> QueryVisitNoSatisfied([FromQuery] QueryVisitNoSatiisfiedRequest dto)
|
|
|
{
|
|
|
- var dissatisfiedReason = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.DissatisfiedReason);
|
|
|
-
|
|
|
+ if (!dto.StartTime.HasValue || !dto.EndTime.HasValue) throw UserFriendlyException.SameMessage("请选择时间!");
|
|
|
+ var dissatisfiedReason = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.DissatisfiedReason);
|
|
|
List<dynamic>? list = new List<dynamic>();
|
|
|
//DataTable dt = new DataTable();
|
|
|
foreach (var item in dissatisfiedReason)
|
|
@@ -233,7 +235,8 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
[HttpGet("visit-nosatisfied-detail")]
|
|
|
public async Task<PagedDto<OrderVisitDetailDto>> BiQueryVisitNoSatisfiedDetail([FromQuery]BiQueryVisitNoSatisfiedDetailDto dto)
|
|
|
{
|
|
|
- var (total,items) = await _orderVisitDetailRepository.Queryable()
|
|
|
+ if (!dto.StartTime.HasValue || !dto.EndTime.HasValue) throw UserFriendlyException.SameMessage("请选择时间!");
|
|
|
+ var (total,items) = await _orderVisitDetailRepository.Queryable()
|
|
|
.Includes(x => x.OrderVisit, d => d.Order)
|
|
|
.Includes(x => x.OrderVisit, d => d.Employee)
|
|
|
.Where(x => x.VisitOrgCode == dto.OrgCode)
|
|
@@ -257,7 +260,8 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
[HttpGet("order-delay-data-list")]
|
|
|
public async Task<IReadOnlyList<BiOrderDelayDataDto>> QueryOrderDelayDataList([FromQuery] QueryOrderDelayDataListRequest dto)
|
|
|
{
|
|
|
- var list = await _orderDelayRepository.Queryable()
|
|
|
+ if (!dto.StartTime.HasValue || !dto.EndTime.HasValue) throw UserFriendlyException.SameMessage("请选择时间!");
|
|
|
+ var list = await _orderDelayRepository.Queryable()
|
|
|
.LeftJoin<SystemOrganize>((x, o) => x.ApplyOrgCode == o.Id)
|
|
|
.WhereIF(dto.StartTime.HasValue, (x, o) => x.CreationTime >= dto.StartTime)
|
|
|
.WhereIF(dto.EndTime.HasValue, (x, o) => x.CreationTime <= dto.EndTime)
|
|
@@ -285,6 +289,7 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
[HttpGet("special_data_list")]
|
|
|
public async Task<PagedDto<OrderBiSpecialListVo>> SpecialDataList([FromQuery] ReportPagedRequest dto)
|
|
|
{
|
|
|
+ if (!dto.StartTime.HasValue || !dto.EndTime.HasValue) throw UserFriendlyException.SameMessage("请选择时间!");
|
|
|
var query = _orderSpecialRepository.Queryable()
|
|
|
.WhereIF(dto.StartTime.HasValue, x => x.CreationTime >= dto.StartTime)
|
|
|
.WhereIF(dto.EndTime.HasValue, x => x.CreationTime <= dto.EndTime)
|