From 4b97cb0275de448895fd9e803f24a87ec89f4057 Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Tue, 4 Apr 2023 23:30:30 +0400 Subject: [PATCH] . --- .../BusinessLogics/ReportCashierLogic.cs | 8 ++++---- .../SearchModels/CashWithdrawalSearchModel.cs | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/ReportCashierLogic.cs b/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/ReportCashierLogic.cs index c1e64c1..8b7d330 100644 --- a/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/ReportCashierLogic.cs +++ b/BankYouBankrupt/BankYouBankruptBusinessLogic/BusinessLogics/ReportCashierLogic.cs @@ -47,7 +47,7 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics .Select(x => new ReportCashierViewModel { AccountId = x.Id, - DateOperation = x.DateOperation, + DateComplite = x.DateOperation, ClientName = x.ClientName, SumOperation = x.SumOperation, TypeOperation = x.TypeOperation @@ -58,10 +58,10 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics public List? GetCashWithrawals(ReportBindingModel model) { return _cashWithdrawalStorage.GetFilteredList(new CashWithdrawalSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo }) - .Select(x => new ReportOrdersViewModel + .Select(x => new ReportCashierViewModel { - Id = x.Id, - DateCreate = x.DateCreate, + AccountId = x.Id, + DateComplite = x.DateOperation, ManufactureName = x.ManufactureName, Sum = x.Sum, OrderStatus = x.Status.ToString() diff --git a/BankYouBankrupt/BankYouBankruptContracts/SearchModels/CashWithdrawalSearchModel.cs b/BankYouBankrupt/BankYouBankruptContracts/SearchModels/CashWithdrawalSearchModel.cs index b629919..eb6f703 100644 --- a/BankYouBankrupt/BankYouBankruptContracts/SearchModels/CashWithdrawalSearchModel.cs +++ b/BankYouBankrupt/BankYouBankruptContracts/SearchModels/CashWithdrawalSearchModel.cs @@ -14,6 +14,8 @@ namespace BankYouBankruptContracts.SearchModels public int? Sum { get; set; } - public DateTime? DateOperation { get; set; } + public DateTime? DateFrom { get; set; } + + public DateTime? DateTo { get; set; } } }