forked from ddrilling/AsbCloudServer
Merge pull request 'Фикс изменение плановый/фактических дней' (#322) from fix/well_report into dev
Reviewed-on: https://test.digitaldrilling.ru:8443/DDrilling/AsbCloudServer/pulls/322
This commit is contained in:
commit
4f75cc42dd
@ -76,8 +76,6 @@ public class WellReportService : IWellReportService
|
|||||||
var drillerReports = await GetDrillerReportsAsync(idWell, token);
|
var drillerReports = await GetDrillerReportsAsync(idWell, token);
|
||||||
|
|
||||||
var firstFactOperation = factWellOperations.MinByOrDefault(x => x.DateStart);
|
var firstFactOperation = factWellOperations.MinByOrDefault(x => x.DateStart);
|
||||||
var lastFactOperation = factWellOperations.MaxByOrDefault(x => x.DateStart);
|
|
||||||
|
|
||||||
var lastPlanOperation = planWellOperations.MaxByOrDefault(x => x.DateStart);
|
var lastPlanOperation = planWellOperations.MaxByOrDefault(x => x.DateStart);
|
||||||
|
|
||||||
var planTrajectories = await trajectoryPlanRepository.GetAsync(idWell, token);
|
var planTrajectories = await trajectoryPlanRepository.GetAsync(idWell, token);
|
||||||
@ -92,8 +90,8 @@ public class WellReportService : IWellReportService
|
|||||||
DateTo = lastPlanOperation?.DateStart.AddHours(lastPlanOperation.DurationHours),
|
DateTo = lastPlanOperation?.DateStart.AddHours(lastPlanOperation.DurationHours),
|
||||||
Days = new PlanFactDto<double?>
|
Days = new PlanFactDto<double?>
|
||||||
{
|
{
|
||||||
Plan = lastPlanOperation?.Day,
|
Plan = planWellOperations.Sum(x => x.DurationHours) / 24,
|
||||||
Fact = lastFactOperation?.Day
|
Fact = factWellOperations.Sum(x => x.DurationHours) / 24
|
||||||
},
|
},
|
||||||
WellBoreDepth = new PlanFactDto<double?>
|
WellBoreDepth = new PlanFactDto<double?>
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user