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

refactor names

Browse Source
This commit is contained in:
Фролов 2021-09-23 11:56:12 +05:00 committed by KharchenkoVV
parent 84e82438f7
commit 845f1f0fb1
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudInfrastructure/Services/DrillingProgramApacheService.cs
View File

@ -55,7 +55,7 @@ namespace AsbCloudInfrastructure.Services
var fileNames = filesInfos
.Where(f => f.Name != resultFileName)
.Select(f => fileService.GetFileName(f));
.Select(f => fileService.GetUrl(f));
var stream = new MemoryStream(1024 * 1024);
UniteExcelFiles(fileNames, stream);

18
AsbCloudInfrastructure/Services/ReportService.cs
View File

@ -180,19 +180,13 @@ namespace AsbCloudInfrastructure.Services
DateTime end, int stepSeconds, int format, AsbCloudDbContext context)
{
var dataSource = new ReportDataSourcePgCloud(context, idWell);
IReportGenerator generator;
switch (format)
IReportGenerator generator = format switch
{
case 1: //LAS
generator = new AsbSaubReportLas.ReprotGeneratorLas(dataSource);
break;
case 0: //PDF
default:
generator = new AsbSaubReportPdf.ReprotGeneratorPdf(dataSource);
break;
}
//LAS
1 => new AsbSaubReportLas.ReprotGeneratorLas(dataSource),
//PDF
_ => new AsbSaubReportPdf.ReprotGeneratorPdf(dataSource),
};
generator.Begin = begin;
generator.End = end;
generator.Step = TimeSpan.FromSeconds(stepSeconds);