diff --git a/AsbCloudInfrastructure/Services/DailyReport/CellAddress.cs b/AsbCloudInfrastructure/Services/DailyReport/CellAddress.cs index d6fb6bb9..cff2f920 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/CellAddress.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/CellAddress.cs @@ -46,12 +46,12 @@ namespace AsbCloudInfrastructure.Services.DailyReport private string CalcColumnLetter() { string letter = ""; - - while (ColumnNumber > 0) + var columnNumber = ColumnNumber; + while (columnNumber > 0) { - int modulo = (ColumnNumber - 1) % excelLettersCount; + int modulo = (columnNumber - 1) % excelLettersCount; letter = Convert.ToChar('A' + modulo) + letter; - ColumnNumber = (ColumnNumber - modulo) / excelLettersCount; + columnNumber = (columnNumber - modulo) / excelLettersCount; } return letter; diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SaubBlock.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SaubBlock.cs index f32f9435..db0b892e 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SaubBlock.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportBlocks/SaubBlock.cs @@ -209,18 +209,18 @@ namespace AsbCloudInfrastructure.Services.DailyReport.DailyReportBlocks sheet._Range(SectionPenetrationTotalValue, SectionPenetrationTotalValue + (0, 3)) ._SetValue($"{blockDto.SectionPenetrationTotal}"); - //var test = ExtensionsCount + (0, 3); + CellAddress test = AddressExtensionsCount + (0, 3); - //sheet._Range(ExtensionsCount, test) - // ._SetValue("Кол- во наращиваний"); - //sheet._Range(ExtensionsCountValue, ExtensionsCountValue + (0, 3)) - // ._SetValue($"{blockDto.ExtensionsCount}"); - //sheet._Range(DeviationFromTVD, DeviationFromTVD + (0, 3)) - // ._SetValue("Отклонение от ГГД +/-, сут"); - //sheet._Range(DeviationFromTVDValue, DeviationFromTVDValue + (0, 3)) - // ._SetValue($"{blockDto.DeviationFromTVD}"); - //sheet._Range(DeclinesReasonsROP, DeclinesReasonsROP + (1, 7)) - // ._SetValue($"Примечание: {blockDto.DeclinesReasonsROP}"); + sheet._Range(AddressExtensionsCount, test) + ._SetValue("Кол- во наращиваний"); + sheet._Range(AddressExtensionsCountValue, AddressExtensionsCountValue + (0, 3)) + ._SetValue($"{blockDto.ExtensionsCount}"); + sheet._Range(DeviationFromTVD, DeviationFromTVD + (0, 3)) + ._SetValue("Отклонение от ГГД +/-, сут"); + sheet._Range(DeviationFromTVDValue, DeviationFromTVDValue + (0, 3)) + ._SetValue($"{blockDto.DeviationFromTVD}"); + sheet._Range(DeclinesReasonsROP, DeclinesReasonsROP + (1, 7)) + ._SetValue($"Примечание: {blockDto.DeclinesReasonsROP}"); } }