From a36736731b03c08ff2682aca92867c06d14ee907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=94?= =?UTF-8?q?=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BA?= =?UTF-8?q?=D1=81=D0=B0=D0=BD=D0=B4=D1=80=D0=BE=D0=B2=D0=B8=D1=87?= Date: Tue, 15 Aug 2023 17:36:47 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Data/ProcessMap/ProcessMapPlanDto.cs | 5 ----- .../Services/ProcessMap/ProcessMapPlanImportService.cs | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/AsbCloudApp/Data/ProcessMap/ProcessMapPlanDto.cs b/AsbCloudApp/Data/ProcessMap/ProcessMapPlanDto.cs index 8849e13d..0a4c1044 100644 --- a/AsbCloudApp/Data/ProcessMap/ProcessMapPlanDto.cs +++ b/AsbCloudApp/Data/ProcessMap/ProcessMapPlanDto.cs @@ -87,10 +87,5 @@ namespace AsbCloudApp.Data.ProcessMap /// Плановый процент использования spin master /// public double UsageSpin { get; set; } - - /// - /// DTO типа секции - /// - public WellSectionTypeDto WellSectionType { get; set; } = null!; } } diff --git a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapPlanImportService.cs b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapPlanImportService.cs index dc5d87b3..fd0ce38b 100644 --- a/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapPlanImportService.cs +++ b/AsbCloudInfrastructure/Services/ProcessMap/ProcessMapPlanImportService.cs @@ -75,6 +75,8 @@ public class ProcessMapPlanImportService : IProcessMapPlanImportService public async Task ExportAsync(int idWell, CancellationToken cancellationToken) { + sections = (await wellSectionTypeRepository.GetAllAsync(cancellationToken)).ToArray(); + var processMapPlans = (await processMapPlanRepository.GetByIdWellAsync(idWell, cancellationToken)).ToArray(); @@ -120,7 +122,7 @@ public class ProcessMapPlanImportService : IProcessMapPlanImportService private void AddToRow(IXLRow row, ProcessMapPlanDto processMap) { - row.Cell(columnWellSectionType).Value = processMap.WellSectionType.Caption; + row.Cell(columnWellSectionType).Value = sections.FirstOrDefault(x => x.Id == processMap.IdWellSectionType)?.Caption; row.Cell(columnMode).Value = GetModeCaption(processMap.IdMode); row.Cell(columnDepthStart).Value = processMap.DepthStart; row.Cell(columnDepthEnd).Value = processMap.DepthEnd;