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

Merge pull request 'Фикс изменение плановый/фактических дней' (#322) from fix/well_report into dev

Browse Source 
Reviewed-on: https://test.digitaldrilling.ru:8443/DDrilling/AsbCloudServer/pulls/322
This commit is contained in:
Никита Фролов 2024-09-05 14:21:56 +05:00
commit 4f75cc42dd
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AsbCloudInfrastructure/Services/WellReport/WellReportService.cs
View File

@ -76,8 +76,6 @@ public class WellReportService : IWellReportService
var drillerReports = await GetDrillerReportsAsync(idWell, token);
var firstFactOperation = factWellOperations.MinByOrDefault(x => x.DateStart);
var lastFactOperation = factWellOperations.MaxByOrDefault(x => x.DateStart);
var lastPlanOperation = planWellOperations.MaxByOrDefault(x => x.DateStart);
var planTrajectories = await trajectoryPlanRepository.GetAsync(idWell, token);
@ -92,8 +90,8 @@ public class WellReportService : IWellReportService
DateTo = lastPlanOperation?.DateStart.AddHours(lastPlanOperation.DurationHours),
Days = new PlanFactDto<double?>
{
Plan = lastPlanOperation?.Day,
Fact = lastFactOperation?.Day
Plan = planWellOperations.Sum(x => x.DurationHours) / 24,
Fact = factWellOperations.Sum(x => x.DurationHours) / 24
},
WellBoreDepth = new PlanFactDto<double?>
{