forked from ddrilling/AsbCloudServer
Фикс
This commit is contained in:
parent
d9dac97b9e
commit
c05a9cb92b
@ -193,7 +193,7 @@ public class OperationsStatService : IOperationsStatService
|
|||||||
|
|
||||||
var operationTo = factOperations.Last();
|
var operationTo = factOperations.Last();
|
||||||
|
|
||||||
return (operationTo.DateStart.AddHours(operationFrom.DurationHours) - operationFrom.DateStart).TotalDays;
|
return (operationTo.DateStart.AddHours(operationTo.DurationHours) - operationFrom.DateStart).TotalDays;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static double? CalcTvdLagDays(IEnumerable<WellOperation> wellOperations)
|
private static double? CalcTvdLagDays(IEnumerable<WellOperation> wellOperations)
|
||||||
@ -218,14 +218,8 @@ public class OperationsStatService : IOperationsStatService
|
|||||||
|
|
||||||
var lastFactOperation = factOperations.Last();
|
var lastFactOperation = factOperations.Last();
|
||||||
|
|
||||||
var remainingPlanOperations = operationsOrdered
|
var factEnd = lastFactOperation.DateStart.AddHours(lastFactOperation.DurationHours);
|
||||||
.Where(o => o.IdType == WellOperation.IdOperationTypePlan)
|
var planEnd = lastCorrespondingFactOperation.DateStart.AddHours(lastCorrespondingFactOperation.DurationHours);
|
||||||
.Where(o => o.DateStart > lastCorrespondingPlanOperation.DateStart);
|
|
||||||
|
|
||||||
var durationRemain = remainingPlanOperations.Sum(o => o.DurationHours);
|
|
||||||
|
|
||||||
var factEnd = lastFactOperation.DateStart.AddHours(durationRemain + lastFactOperation.DurationHours);
|
|
||||||
var planEnd = lastCorrespondingFactOperation.DateStart.AddHours(durationRemain + lastCorrespondingFactOperation.DurationHours);
|
|
||||||
var lagDays = (planEnd - factEnd).TotalDays;
|
var lagDays = (planEnd - factEnd).TotalDays;
|
||||||
|
|
||||||
return lagDays;
|
return lagDays;
|
||||||
|
Loading…
Reference in New Issue
Block a user