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

CS2-70: Added wells with no operations into cluster info

Browse Source
This commit is contained in:
KharchenkoVV 2021-09-02 11:42:05 +05:00
parent 95733371a2
commit 81e765581c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
AsbCloudInfrastructure/Services/WellOperationsStatService.cs
View File

@ -82,18 +82,17 @@ namespace AsbCloudInfrastructure.Services
public async Task<StatClusterDto> GetStatClusterAsync(int idCluster, CancellationToken token = default) public async Task<StatClusterDto> GetStatClusterAsync(int idCluster, CancellationToken token = default)
{ {
var operations = await db.WellOperations var wells = await db.Wells
.Where(o => o.Well.IdCluster == idCluster) .Include(w => w.WellOperations)
.OrderBy(o => o.StartDate) .Where(o => o.IdCluster == idCluster)
.AsNoTracking() .AsNoTracking()
.ToListAsync(token); .ToListAsync(token);
if (!operations.Any()) var operations = wells.SelectMany(w => w.WellOperations).OrderBy(o => o.StartDate);
return null;
var cluster = await cacheCluster.FirstOrDefaultAsync(c => c.Id == idCluster, token); var cluster = await cacheCluster.FirstOrDefaultAsync(c => c.Id == idCluster, token);
var wellsIds = operations.Select(o => o.IdWell).Distinct(); var wellsIds = wells.Select(o => o.Id).Distinct();
var statsWells = new List<StatWellDto>(wellsIds.Count()); var statsWells = new List<StatWellDto>(wellsIds.Count());
@ -137,6 +136,13 @@ namespace AsbCloudInfrastructure.Services
var well = await cacheWell.FirstOrDefaultAsync(w => w.Id == idWell, token); var well = await cacheWell.FirstOrDefaultAsync(w => w.Id == idWell, token);
var wellType = await cacheWellType.FirstOrDefaultAsync(t => t.Id == well.IdWellType, token); var wellType = await cacheWellType.FirstOrDefaultAsync(t => t.Id == well.IdWellType, token);
if (!wellOperations.Any())
return new StatWellDto()
{
Caption = well.Caption,
WellType = wellType.Caption
};
var statWellDto = new StatWellDto var statWellDto = new StatWellDto
{ {
Id = idWell, Id = idWell,