From 38f861c2e90bf974cea997928b9211e981d60845 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?= Date: Fri, 22 Dec 2023 09:48:18 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B8=D0=BC=D0=BF?= =?UTF-8?q?=D0=BE=D1=80=D1=82=D0=B0=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD?= =?UTF-8?q?=D0=B0=20=D1=81=20=D0=BF=D0=BB=D0=B0=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D0=BC=D0=B8=20=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D1=8F?= =?UTF-8?q?=D0=BC=D0=B8=20=D0=93=D0=93=D0=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudWebApi/Controllers/WellOperationController.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/AsbCloudWebApi/Controllers/WellOperationController.cs b/AsbCloudWebApi/Controllers/WellOperationController.cs index d4723657..ae0c8b92 100644 --- a/AsbCloudWebApi/Controllers/WellOperationController.cs +++ b/AsbCloudWebApi/Controllers/WellOperationController.cs @@ -403,7 +403,8 @@ namespace AsbCloudWebApi.Controllers /// /// Импорт операций из excel (xlsx) файла. ГПНХ (Хантос) /// - /// id скважины + /// Id скважины + /// Параметры парсинга /// Коллекция из одного файла xlsx /// /// @@ -412,14 +413,12 @@ namespace AsbCloudWebApi.Controllers [ProducesResponseType(typeof(ValidationProblemDetails), StatusCodes.Status400BadRequest)] [Permission] public Task ImportPlanGazpromKhantosExcelFileAsync(int idWell, + [FromQuery] WellOperationImportGazpromKhantosOptionsDto options, [FromForm] IFormFileCollection files, CancellationToken cancellationToken) { - var options = new WellOperationImportGazpromKhantosOptionsDto - { - IdType = WellOperation.IdOperationTypePlan - }; - + options.IdType = WellOperation.IdOperationTypePlan; + return ImportExcelFileAsync(idWell, files, options, (stream, _) => wellOperationGazpromKhantosExcelParser.Parse(stream, options), null,