From d1716fa01bbea626a134e2eb16ea70c1cef1f0c9 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Tue, 13 Aug 2024 10:18:27 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D1=80?= =?UTF-8?q?=D0=B0=D1=81=D1=87=D0=B5=D1=82=D0=B0=20=D0=B4=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D1=85=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B3=D1=80=D0=B0=D1=84?= =?UTF-8?q?=D0=B8=D0=BA=D0=B0=20=D1=82=D0=B2=D0=B4=20(=D0=B4=D0=BD=D0=B8?= =?UTF-8?q?=20=D1=81=D0=BE=20=D1=81=D1=82=D0=B0=D1=80=D1=82=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OperationsStatService.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/AsbCloudInfrastructure/Services/WellOperationService/OperationsStatService.cs b/AsbCloudInfrastructure/Services/WellOperationService/OperationsStatService.cs index 07146882..b1756101 100644 --- a/AsbCloudInfrastructure/Services/WellOperationService/OperationsStatService.cs +++ b/AsbCloudInfrastructure/Services/WellOperationService/OperationsStatService.cs @@ -431,6 +431,10 @@ public class OperationsStatService : IOperationsStatService int? iLastMatch = null; int iLastFact = 0; var nptHours = 0d; + + DateTimeOffset? firstDateStartFact = Fact!.DateStart; + DateTimeOffset? firstDateStartPlan = Plan?.DateStart; + for (int i = 0; i < wellOperations.Length; i++) { var item = wellOperations[i]; @@ -441,7 +445,13 @@ public class OperationsStatService : IOperationsStatService if (plan is not null) { planFactPredict.Plan = Convert(plan, tzOffsetHours); - planFactPredict.Plan.Day = (planFactPredict.Plan.DateStart - dateStart).TotalDays; + + if (!firstDateStartPlan.HasValue) { + firstDateStartPlan = planFactPredict.Plan.DateStart; + } + + planFactPredict.Plan.Day = (planFactPredict.Plan.DateStart - firstDateStartPlan.Value).TotalDays; + if (fact is not null) iLastMatch = i; } @@ -451,8 +461,9 @@ public class OperationsStatService : IOperationsStatService if(WellOperationCategory.NonProductiveTimeSubIds.Contains(fact.IdCategory)) nptHours += fact.DurationHours; - planFactPredict.Fact = Convert(fact, tzOffsetHours); - planFactPredict.Fact.Day = (planFactPredict.Fact.DateStart - dateStart).TotalDays; + planFactPredict.Fact = Convert(fact, tzOffsetHours); + planFactPredict.Fact.Day = (planFactPredict.Fact.DateStart - firstDateStartFact.Value).TotalDays; + planFactPredict.Fact.NptHours = nptHours; iLastFact = i; }