diff --git a/AsbCloudApp/Data/SAUB/DrillTestParamsDto.cs b/AsbCloudApp/Data/SAUB/DrillTestParamsDto.cs index f2b8ceac..f8d9d168 100644 --- a/AsbCloudApp/Data/SAUB/DrillTestParamsDto.cs +++ b/AsbCloudApp/Data/SAUB/DrillTestParamsDto.cs @@ -26,7 +26,7 @@ public float? DepthSpeed { get; set; } /// - /// Время бурения шага + /// Время бурения шага, сек /// public float? TimeDrillStep { get; set; } diff --git a/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportMakerService.cs b/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportMakerService.cs index 1badc97e..27a01e85 100644 --- a/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportMakerService.cs +++ b/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportMakerService.cs @@ -1,6 +1,7 @@ using AsbCloudApp.Data.DrillTestReport; using AsbCloudApp.Services; using ClosedXML.Excel; +using System; using System.IO; using System.Linq; using System.Reflection; @@ -70,7 +71,7 @@ namespace AsbCloudInfrastructure.Services.DrillTestReport cell = sheet.Cell(rowNumber, 8); cell._SetValue(endDateTime.DateTime); - sheet.Cell(rowNumber, 9).Value = drillTestEntity.TimeDrillStep; + sheet.Cell(rowNumber, 9).Value = Math.Round((drillTestEntity.TimeDrillStep ?? 0) / (60 * 60), 2); sheet.Cell(rowNumber, 10).Value = drillTestEntity.DepthSpeed; diff --git a/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportTemplate.xlsx b/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportTemplate.xlsx index 5b9e8ec1..c6336b88 100644 Binary files a/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportTemplate.xlsx and b/AsbCloudInfrastructure/Services/DrillTestReport/DrillTestReportTemplate.xlsx differ