This commit is contained in:
Programmist73 2023-04-04 23:24:12 +04:00
parent 17c796bc0f
commit 33f440412d

View File

@ -19,7 +19,7 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics
private readonly ICashWithdrawalStorage _cashWithdrawalStorage; private readonly ICashWithdrawalStorage _cashWithdrawalStorage;
//private readonly IAccountStorage _accountStorage; private readonly IAccountStorage _accountStorage;
private readonly AbstractSaveToExcelCashier _saveToExcel; private readonly AbstractSaveToExcelCashier _saveToExcel;
@ -34,7 +34,7 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics
{ {
_moneyTransferStorage = moneyTransferStorage; _moneyTransferStorage = moneyTransferStorage;
_cashWithdrawalStorage = cashWithdrawalStorage; _cashWithdrawalStorage = cashWithdrawalStorage;
//_accountStorage = accountStorage; _accountStorage = accountStorage;
_saveToExcel = saveToExcel; _saveToExcel = saveToExcel;
_saveToWord = saveToWord; _saveToWord = saveToWord;
@ -43,11 +43,11 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics
public List<ReportCashierViewModel>? GetMoneyTransfers(ReportBindingModel model) public List<ReportCashierViewModel>? GetMoneyTransfers(ReportBindingModel model)
{ {
return _moneyTransferStorage.GetFilteredList(new MoneyTransferSearchModel { DateOperation = model.DateOperation}) return _moneyTransferStorage.GetFilteredList(new MoneyTransferSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo})
.Select(x => new ReportCashierViewModel .Select(x => new ReportCashierViewModel
{ {
AccountId = x.Id, AccountId = x.Id,
DateComplite = x.DateComplite, DateOperation = x.DateOperation,
ClientName = x.ClientName, ClientName = x.ClientName,
SumOperation = x.SumOperation, SumOperation = x.SumOperation,
TypeOperation = x.TypeOperation TypeOperation = x.TypeOperation
@ -57,7 +57,7 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics
public List<ReportCashierViewModel>? GetCashWithrawals(ReportBindingModel model) public List<ReportCashierViewModel>? GetCashWithrawals(ReportBindingModel model)
{ {
return _accountStorage.GetFilteredList(new CashWithdrawalSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo }) return _cashWithdrawalStorage.GetFilteredList(new CashWithdrawalSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo })
.Select(x => new ReportOrdersViewModel .Select(x => new ReportOrdersViewModel
{ {
Id = x.Id, Id = x.Id,