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

Fix WellOperationExportService remove useless asyncs

Browse Source
This commit is contained in:
ngfrolov 2023-12-05 14:14:20 +05:00
parent 3e6f43a4a6
commit e67e260f35
Signed by: ng.frolov
GPG Key ID: E99907A0357B29A7
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
AsbCloudInfrastructure/Services/WellOperationImport/WellOperationExportService.cs
View File

@ -38,16 +38,15 @@ public class WellOperationExportService : IWellOperationExportService
var timezone = wellService.GetTimezone(idWell);
return await MakeExcelFileStreamAsync(operations, timezone.Hours, cancellationToken);
return MakeExcelFileStream(operations, timezone.Hours);
}
private async Task<Stream> MakeExcelFileStreamAsync(IEnumerable<WellOperationDto> operations, double timezoneOffset,
CancellationToken cancellationToken)
private Stream MakeExcelFileStream(IEnumerable<WellOperationDto> operations, double timezoneOffset)
{
using Stream ecxelTemplateStream = wellOperationImportTemplateService.GetExcelTemplateStream();
using var workbook = new XLWorkbook(ecxelTemplateStream, XLEventTracking.Disabled);
await AddOperationsToWorkbook(workbook, operations, timezoneOffset, cancellationToken);
AddOperationsToWorkbook(workbook, operations, timezoneOffset);
var memoryStream = new MemoryStream();
workbook.SaveAs(memoryStream, new SaveOptions { });
@ -55,15 +54,14 @@ public class WellOperationExportService : IWellOperationExportService
return memoryStream;
}
private async Task AddOperationsToWorkbook(XLWorkbook workbook, IEnumerable<WellOperationDto> operations, double timezoneOffset,
CancellationToken cancellationToken)
private void AddOperationsToWorkbook(XLWorkbook workbook, IEnumerable<WellOperationDto> operations, double timezoneOffset)
{
var planOperations = operations.Where(o => o.IdType == 0);
if (planOperations.Any())
{
var sheetPlan = workbook.Worksheets.FirstOrDefault(ws => ws.Name == DefaultTemplateInfo.SheetNamePlan);
if (sheetPlan is not null)
await AddOperationsToSheetAsync(sheetPlan, planOperations, timezoneOffset, cancellationToken);
AddOperationsToSheet(sheetPlan, planOperations, timezoneOffset);
}
var factOperations = operations.Where(o => o.IdType == 1);
@ -71,12 +69,11 @@ public class WellOperationExportService : IWellOperationExportService
{
var sheetFact = workbook.Worksheets.FirstOrDefault(ws => ws.Name == DefaultTemplateInfo.SheetNameFact);
if (sheetFact is not null)
await AddOperationsToSheetAsync(sheetFact, factOperations, timezoneOffset, cancellationToken);
AddOperationsToSheet(sheetFact, factOperations, timezoneOffset);
}
}
private async Task AddOperationsToSheetAsync(IXLWorksheet sheet, IEnumerable<WellOperationDto> operations, double timezoneOffset,
CancellationToken cancellationToken)
private void AddOperationsToSheet(IXLWorksheet sheet, IEnumerable<WellOperationDto> operations, double timezoneOffset)
{
var operationsToArray = operations.ToArray();