From 931c363b810f75034132eca76afbe2f24bd8cbdc Mon Sep 17 00:00:00 2001 From: Zakharov_Rostislav Date: Sun, 26 May 2024 15:56:24 +0400 Subject: [PATCH] fix errors --- Bank/BankBusinessLogic/BusinessLogic/ReportLogic.cs | 2 +- .../OfficePackage/AbstractSaveToExcel.cs | 10 +++++----- Bank/BankContracts/BindingModels/ReportBindingModel.cs | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Bank/BankBusinessLogic/BusinessLogic/ReportLogic.cs b/Bank/BankBusinessLogic/BusinessLogic/ReportLogic.cs index 6de0d61..79d3f73 100644 --- a/Bank/BankBusinessLogic/BusinessLogic/ReportLogic.cs +++ b/Bank/BankBusinessLogic/BusinessLogic/ReportLogic.cs @@ -82,7 +82,7 @@ namespace BankBusinessLogic.BusinessLogic Title = "Список кузнечных изделий", Transfers = CreateReportTransfers(new CardSearchModel { - SelectedCardIds = model.S + SelectedCardIds = model.SelectedCardsIds }) }); } diff --git a/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToExcel.cs index 32f613f..1d49016 100644 --- a/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToExcel.cs +++ b/Bank/BankBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -37,17 +37,17 @@ namespace BankBusinessLogic.OfficePackage { ColumnName = "A", RowIndex = rowIndex, - Text = transfer.ComputerName, + Text = "", StyleInfo = ExcelStyleInfoType.Text }); rowIndex++; - foreach (var component in transfer.Components) + foreach (var component in transfer.Transfers) { InsertCellInWorksheet(new ExcelCellParameters { ColumnName = "B", RowIndex = rowIndex, - Text = component.Item1, + Text = "", StyleInfo = ExcelStyleInfoType.TextWithBroder }); @@ -55,7 +55,7 @@ namespace BankBusinessLogic.OfficePackage { ColumnName = "C", RowIndex = rowIndex, - Text = component.Item2.ToString(), + Text = "", StyleInfo = ExcelStyleInfoType.TextWithBroder }); @@ -72,7 +72,7 @@ namespace BankBusinessLogic.OfficePackage { ColumnName = "C", RowIndex = rowIndex, - Text = transfer.TotalCount.ToString(), + Text = "", StyleInfo = ExcelStyleInfoType.Text }); rowIndex++; diff --git a/Bank/BankContracts/BindingModels/ReportBindingModel.cs b/Bank/BankContracts/BindingModels/ReportBindingModel.cs index 1259118..1154b92 100644 --- a/Bank/BankContracts/BindingModels/ReportBindingModel.cs +++ b/Bank/BankContracts/BindingModels/ReportBindingModel.cs @@ -12,5 +12,6 @@ namespace BankContracts.BindingModels public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } public List? SelectedAccountIds { get; set; } + public List? SelectedCardsIds { get; set; } } }