|
|
@@ -456,16 +456,25 @@ namespace Hotline.Application.StatisticalReport
|
|
|
/// <returns></returns>
|
|
|
public ISugarQueryable<SelectOrderId> DepartmentalProcessingStatisticsDetailsList(DepartmentalProcessingStatisticsRequest dto)
|
|
|
{
|
|
|
- var query = _workflowTraceRepository.Queryable()
|
|
|
- .LeftJoin<Order>((t, o) => t.ExternalId == o.Id)
|
|
|
- .Where((t, o) => t.ModuleCode == WorkflowModuleConsts.OrderHandle && o.CreationTime >= dto.StartTime && o.CreationTime <= dto.EndTime)
|
|
|
- .WhereIF(dto.IsProvince.HasValue && dto.IsProvince == true, (t, o) => o.Source == ESource.ProvinceStraight)
|
|
|
- .WhereIF(dto.TypeId != null && dto.TypeId == 1, (t, o) => o.IdentityType == EIdentityType.Citizen)
|
|
|
- .WhereIF(dto.TypeId != null && dto.TypeId == 2, (t, o) => o.IdentityType == EIdentityType.Enterprise)
|
|
|
+ //var query = _workflowTraceRepository.Queryable()
|
|
|
+ // .LeftJoin<Order>((t, o) => t.ExternalId == o.Id)
|
|
|
+ // .Where((t, o) => t.ModuleCode == WorkflowModuleConsts.OrderHandle && o.CreationTime >= dto.StartTime && o.CreationTime <= dto.EndTime)
|
|
|
+ // .WhereIF(dto.IsProvince.HasValue && dto.IsProvince == true, (t, o) => o.Source == ESource.ProvinceStraight)
|
|
|
+ // .WhereIF(dto.TypeId != null && dto.TypeId == 1, (t, o) => o.IdentityType == EIdentityType.Citizen)
|
|
|
+ // .WhereIF(dto.TypeId != null && dto.TypeId == 2, (t, o) => o.IdentityType == EIdentityType.Enterprise)
|
|
|
+ // // .WhereIF(IsCenter, (t, o) => t.HandlerOrgId == dto.OrgCode)
|
|
|
+ // .WhereIF(!_sessionContext.OrgIsCenter, (t, o) => t.HandlerOrgId.StartsWith(dto.OrgCode))
|
|
|
+ // .GroupBy((t, o) => o.Id)
|
|
|
+ // .Select((t, o) => new SelectOrderId { Id = o.Id })
|
|
|
+ // .MergeTable();
|
|
|
+ var query = _orderRepository.Queryable()
|
|
|
+ .Where(o => o.CreationTime >= dto.StartTime && o.CreationTime <= dto.EndTime)
|
|
|
+ .WhereIF(dto.IsProvince.HasValue && dto.IsProvince == true, o => o.Source == ESource.ProvinceStraight)
|
|
|
+ .WhereIF(dto.TypeId != null && dto.TypeId == 1, o => o.IdentityType == EIdentityType.Citizen)
|
|
|
+ .WhereIF(dto.TypeId != null && dto.TypeId == 2, o => o.IdentityType == EIdentityType.Enterprise)
|
|
|
// .WhereIF(IsCenter, (t, o) => t.HandlerOrgId == dto.OrgCode)
|
|
|
- .WhereIF(!_sessionContext.OrgIsCenter, (t, o) => t.HandlerOrgId.StartsWith(dto.OrgCode))
|
|
|
- .GroupBy((t, o) => o.Id)
|
|
|
- .Select((t, o) => new SelectOrderId { Id = o.Id })
|
|
|
+ .WhereIF(!_sessionContext.OrgIsCenter, o => o.ActualHandleOrgCode.StartsWith(dto.OrgCode))
|
|
|
+ .Select(o => new SelectOrderId { Id = o.Id })
|
|
|
.MergeTable();
|
|
|
|
|
|
return query;
|
tangjiang