on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Fix WellOperationsStatService.GetStatClusterAsync() Add empty stat for wells with no operations

Browse Source
This commit is contained in:
Фролов 2021-10-13 15:45:24 +05:00
parent 70ee22bccf
commit 6439bba779
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AsbCloudInfrastructure/Services/WellOperationService/WellOperationsStatService.cs
View File

@ -70,7 +70,6 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
var wells = await db.Wells var wells = await db.Wells
.Include(w => w.WellOperations) .Include(w => w.WellOperations)
.Where(w => idWells.Contains(w.Id)) .Where(w => idWells.Contains(w.Id))
.Where(w => w.WellOperations.Any())
.AsNoTracking() .AsNoTracking()
.ToListAsync(token); .ToListAsync(token);
@ -98,10 +97,6 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
private async Task<StatWellDto> CalcStatWellAsync(Well well, CancellationToken token = default) private async Task<StatWellDto> CalcStatWellAsync(Well well, CancellationToken token = default)
{ {
var wellOperations = well.WellOperations
.OrderBy(o => o.DateStart)
.ThenBy(o => o.DepthEnd);
var wellType = await cacheWellType.FirstOrDefaultAsync(t => t.Id == well.IdWellType, token); var wellType = await cacheWellType.FirstOrDefaultAsync(t => t.Id == well.IdWellType, token);
var statWellDto = new StatWellDto() var statWellDto = new StatWellDto()
@ -111,6 +106,13 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
WellType = wellType.Caption WellType = wellType.Caption
}; };
if (well.WellOperations is null)
return statWellDto;
var wellOperations = well.WellOperations
.OrderBy(o => o.DateStart)
.ThenBy(o => o.DepthEnd);
if (!wellOperations.Any()) if (!wellOperations.Any())
return statWellDto; return statWellDto;