on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Merge branch 'dev' of http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer into dev

Browse Source
This commit is contained in:
ngfrolov 2023-12-22 14:41:06 +05:00
commit 710b7f0917
Signed by: ng.frolov
GPG Key ID: E99907A0357B29A7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
AsbCloudInfrastructure/Services/WellOperationImport/Files/WellOperationImportTemplate.xlsx
View File

Binary file not shown.

11
AsbCloudWebApi/Controllers/WellOperationController.cs
View File

@ -403,7 +403,8 @@ namespace AsbCloudWebApi.Controllers
/// <summary>
/// Импорт операций из excel (xlsx) файла. ГПНХ (Хантос)
/// </summary>
/// <param name="idWell">id скважины</param>
/// <param name="idWell">Id скважины</param>
/// <param name="options">Параметры парсинга</param>
/// <param name="files">Коллекция из одного файла xlsx</param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
@ -412,14 +413,12 @@ namespace AsbCloudWebApi.Controllers
[ProducesResponseType(typeof(ValidationProblemDetails), StatusCodes.Status400BadRequest)]
[Permission]
public Task<IActionResult> 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,