From 08e0a4fb38c326da466af051bd3558b61c024d2c Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Wed, 14 Feb 2024 13:12:25 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20-=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Report/ProcessMapReportDataSaubStatService.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDataSaubStatService.cs b/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDataSaubStatService.cs index cc958a01..0dfbf755 100644 --- a/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDataSaubStatService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDataSaubStatService.cs @@ -107,7 +107,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMaps.Report .Where(p => p.IdWellSectionType == idWellSectionType) .Where(p => p.DepthStart <= data.DepthStart) .Where(p => p.DepthEnd >= data.DepthStart) - //.Where(p => IsModeMatchOperationCategory(p.IdMode, data.IdCategory)) + .Where(p => IsModeMatchOperationCategory(p.IdMode, data.IdCategory)) .WhereActualAtMoment(data.DateStart) .FirstOrDefault(); @@ -142,7 +142,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMaps.Report .Where(c => c.Id == idWellSectionType) .FirstOrDefault()?.Caption ?? string.Empty; - var elem = CalcStat(processMapPlan, span, idWellSectionType, wellOperationCategoryName, wellSectionTypeName); + var elem = CalcStat(processMapPlan, span, wellOperationCategoryName, wellSectionTypeName); if (elem is not null) list.Add(elem); } @@ -152,13 +152,12 @@ namespace AsbCloudInfrastructure.Services.ProcessMaps.Report private bool IsModeMatchOperationCategory(int idMode, int idCategory) { - throw new NotImplementedException(); + return (idMode == 1 && idCategory == 5003) || (idMode == 2 && idCategory == 5002); } private ProcessMapReportDataSaubStatDto? CalcStat( ProcessMapPlanDrillingDto? processMapPlanFilteredByDepth, Span span, - int idWellSectionType, string wellOperationCategoryName, string wellSectionTypeName ) @@ -226,7 +225,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMaps.Report }, Rop = new PlanFactDto { - //Plan = CalcRopPlan(processMapPlanFilteredByDepth), + Plan = processMapPlanFilteredByDepth?.RopPlan, Fact = deltaDepth / aggregatedValues.DrilledTime }, };