From f9d725d4b7561ca36949ec697c603f6c70c2336c Mon Sep 17 00:00:00 2001 From: Artyom_Yashin Date: Sun, 26 May 2024 15:50:06 +0400 Subject: [PATCH] =?UTF-8?q?=D0=93=D0=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bank/BankBusinessLogic/BusinessLogic/ReportLogic.cs | 4 ++-- Bank/BankDatabaseImplement/Implements/CardStorage.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Bank/BankBusinessLogic/BusinessLogic/ReportLogic.cs b/Bank/BankBusinessLogic/BusinessLogic/ReportLogic.cs index 1366c3f..00bd921 100644 --- a/Bank/BankBusinessLogic/BusinessLogic/ReportLogic.cs +++ b/Bank/BankBusinessLogic/BusinessLogic/ReportLogic.cs @@ -117,8 +117,8 @@ namespace BankBusinessLogic.BusinessLogic DateTo = model.DateTo!.Value, OperationsRequests = CreateReportOperationsRequests(new CardSearchModel { - DateFrom = model.DateFrom!.Value, - DateTo = model.DateTo!.Value, + DateFrom = model.DateFrom.Value, + DateTo = model.DateTo.Value, }) }); } diff --git a/Bank/BankDatabaseImplement/Implements/CardStorage.cs b/Bank/BankDatabaseImplement/Implements/CardStorage.cs index 2be7b37..f32a1f3 100644 --- a/Bank/BankDatabaseImplement/Implements/CardStorage.cs +++ b/Bank/BankDatabaseImplement/Implements/CardStorage.cs @@ -65,11 +65,11 @@ namespace BankDatabaseImplement.Implements { CardNumber = c.Number, SenderOperations = context.Operations - .Where(x => x.OperationTime >= model.DateFrom && x.OperationTime <= model.DateTo && x.SenderCardId == model.Id) + .Where(x => x.OperationTime >= model.DateFrom && x.OperationTime <= model.DateTo && x.SenderCardId == c.Id) .Select(t => t.GetViewModel) .ToList(), RecipientOperations = context.Operations - .Where(x => x.OperationTime >= model.DateFrom && x.OperationTime <= model.DateTo && x.RecipientCardId == model.Id) + .Where(x => x.OperationTime >= model.DateFrom && x.OperationTime <= model.DateTo && x.RecipientCardId == c.Id) .Select(t => t.GetViewModel) .ToList(), Requests = context.Requests