diff --git a/AsbCloudInfrastructure/Services/WellOperationImport/Files/WellOperationImportTemplate.xlsx b/AsbCloudInfrastructure/Services/WellOperationImport/Files/WellOperationImportTemplate.xlsx index 7e9cec5e..6f53ccfb 100644 Binary files a/AsbCloudInfrastructure/Services/WellOperationImport/Files/WellOperationImportTemplate.xlsx and b/AsbCloudInfrastructure/Services/WellOperationImport/Files/WellOperationImportTemplate.xlsx differ 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,