From 88e2afc1b299501df4ee81511a413c0a5eae3548 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Fri, 20 Oct 2023 16:55:08 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B2?= =?UTF-8?q?=D0=BD=D1=83=D1=82=D1=80=D0=B8=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D0=B0,=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=20=D1=81=D0=B5=D0=BA?= =?UTF-8?q?=D1=83=D0=BD=D0=B4=20=D0=B2=20=D1=87=D0=B0=D1=81=D1=8B=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BE=D1=82=D1=87=D0=B5=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Data/SAUB/DrillTestParamsDto.cs | 2 +- .../DrillTestReportMakerService.cs | 3 ++- .../DrillTestReportTemplate.xlsx | Bin 7284 -> 8013 bytes 3 files changed, 3 insertions(+), 2 deletions(-) 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 5b9e8ec1c720e867771050303bf2431eb91d03a9..c6336b882f479bce949a667cb600fb80cd56dc10 100644 GIT binary patch delta 4914 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 delta 4254 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