forked from ddrilling/AsbCloudServer
Правка расчета сводной статистики по бурильщикам
This commit is contained in:
parent
c03b818d49
commit
5bf30956c8
@ -57,7 +57,7 @@ internal class SubsystemService : ISubsystemService
|
||||
var result = new List<DrillerDetectedOperationStatDto>();
|
||||
var schedulePage = await scheduleRepository.GetPageAsync(request, token);
|
||||
var wells = await wellService.GetAsync(new WellRequest { Ids = request.IdsWells }, token);
|
||||
|
||||
|
||||
foreach (var schedule in schedulePage)
|
||||
{
|
||||
var idWell = schedule.IdWell;
|
||||
@ -68,21 +68,15 @@ internal class SubsystemService : ISubsystemService
|
||||
var detectedOperations = await detectedOperationService
|
||||
.GetOperationsAsync(byWellRequest, token);
|
||||
|
||||
var groupByDriller = detectedOperations
|
||||
.Where(operation => operation.Driller is not null)
|
||||
.GroupBy(operation => operation.Driller);
|
||||
|
||||
foreach (var entry in groupByDriller)
|
||||
var detectedOperationsByCurrentDriller = detectedOperations.Where(d => d.Driller?.Id == schedule.IdDriller);
|
||||
var drillerOperationsStat = await CalcStatAsync(detectedOperationsByCurrentDriller, token);
|
||||
var dto = new DrillerDetectedOperationStatDto
|
||||
{
|
||||
var drillerOperationsStat = await CalcStatAsync(entry, token);
|
||||
var dto = new DrillerDetectedOperationStatDto
|
||||
{
|
||||
Statistic = drillerOperationsStat,
|
||||
Schedule = schedule,
|
||||
Well = well,
|
||||
};
|
||||
result.Add(dto);
|
||||
}
|
||||
Statistic = drillerOperationsStat,
|
||||
Schedule = schedule,
|
||||
Well = well,
|
||||
};
|
||||
result.Add(dto);
|
||||
}
|
||||
|
||||
return result;
|
||||
|
Loading…
Reference in New Issue
Block a user