Merge branch 'dev' into feature/refactoring_api_route

AsbCloudApp/Data/StatWellDto.cs

@@ -53,8 +53,8 @@ namespace AsbCloudApp.Data
         public IEnumerable<CompanyDto> Companies { get; set; } = Enumerable.Empty<CompanyDto>();
 
         /// <summary>
-        /// Отставание от ГГД, дней
+        /// Отставание от ГГД, проценты
         /// </summary>
-        public double TvdLagDays { get; set; } = 0;
+        public double? TvdLagPercent { get; set; }
     }
 }

AsbCloudApp/Data/WellMapInfoDto.cs

@@ -95,9 +95,8 @@ namespace AsbCloudApp.Data
         public PlanFactDto<double?> WellDepth { get; set; } = null!;
 
         /// <summary>
-        /// Отставание от ГГД, дни
+        /// Отставание от ГГД, проценты
         /// </summary>
-        public double TvdLagDays { get; set; }
-
+        public double TvdLagPercent { get; set; }
     }
 }

AsbCloudInfrastructure/Services/WellInfoService.cs

@@ -138,8 +138,7 @@ namespace AsbCloudInfrastructure.Services
                 wellMapInfo.FirstFactOperationDateStart = wellOperationsStat?.Total.Fact?.Start 
                     ?? wellOperationsStat?.Total.Plan?.Start;
 
-                wellMapInfo.LastPredictOperationDateEnd = wellOperationsStat?.Total.Plan?.End?
-                    .AddDays(wellOperationsStat?.TvdLagDays ?? 0d);
+                wellMapInfo.LastPredictOperationDateEnd = wellOperationsStat?.Total.Plan?.End;
 
                 wellMapInfo.WellDepth = new()
                 {
@@ -163,7 +162,7 @@ namespace AsbCloudInfrastructure.Services
                 wellMapInfo.SaubUsage = wellSubsystemStat?.SubsystemAKB?.KUsage ?? 0d;
                 wellMapInfo.SpinUsage = wellSubsystemStat?.SubsystemSpinMaster?.KUsage ?? 0d;
                 wellMapInfo.TorqueKUsage = wellSubsystemStat?.SubsystemTorqueMaster?.KUsage ?? 0d;
-                wellMapInfo.TvdLagDays = wellOperationsStat?.TvdLagDays ?? 0d;
+                wellMapInfo.TvdLagPercent = wellOperationsStat?.TvdLagPercent ?? 0d;
                 wellMapInfo.IdsCompanies = well.Companies.Select(c => c.Id);
 
                 return wellMapInfo;