diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs index 60505718..cd859b00 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/BhaBlock.cs @@ -81,7 +81,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks sheet.Cell(AddressDurationDataStart[1]) ._SetValue($"{blockDto.SluiceBegin}"); sheet.Cell(AddressDurationDataFinish[1]) - ._SetValue($"{blockDto.SluiceBegin}"); + ._SetValue($"{blockDto.SluiceFinish}"); sheet.Cell(AddressTotaData[1]) .SetFormulaA1($"{FormulaBhaBlock(AddressDurationDataStart[1], AddressDurationDataFinish[1])}").Style.SetAllBorders(); sheet._Range(AddressOperationData[2], AddressOperationData[2] + (0, 4)) diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs index bf54bb4d..f10c046e 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/DimensionlessBlock.cs @@ -87,7 +87,7 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks sheet._Range(AddressPreparationHead[2], AddressPreparationHead[2] + (0, 1)) ._SetValue("Проработка при бур, факт (ч):"); sheet.Cell(AddressPreparationValue[2]) - ._SetValue($"{blockDto.StandardTimeExtension}"); + ._SetValue($"{blockDto.ActualTimeBarrelPreparation}"); sheet._Range(AddressPreparationHead[3], AddressPreparationHead[3] + (0, 1)) ._SetValue("Превышение плановых норм, (ч):"); sheet.Cell(AddressPreparationValue[3]) diff --git a/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs index 7ba99ce0..f4532d7c 100644 --- a/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs +++ b/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs @@ -1,6 +1,7 @@ using AsbCloudApp.Data; using AsbCloudApp.Repositories; using AsbCloudInfrastructure.Services; +using AsbCloudInfrastructure.Services.Trajectory; using Moq; using System; using System.Collections.Generic;