.
This commit is contained in:
parent
75b7e8e3cc
commit
155d44e7af
@ -149,7 +149,7 @@ namespace BankYouBankruptBusinessLogic.BusinessLogics
|
||||
Dictionary<(int, int), int> cashWithdrawals = _cashWithdrawalLogic.ReadList(new CashWithdrawalSearchModel()
|
||||
{
|
||||
AccountId = AccountId,
|
||||
}).GroupBy(x => new { x.DateOperation.Month, x.DateOperation.Year })
|
||||
}).Where(x => x.DebitingStatus == StatusEnum.Закрыта ).GroupBy(x => new { x.DateOperation.Month, x.DateOperation.Year })
|
||||
.Select(x => new { x.Key.Month, x.Key.Year, Sum = x.Select(y => y.Sum).Sum() }).ToDictionary(x => (x.Month, x.Year), x => (x.Sum));
|
||||
|
||||
Dictionary<(int, int), int> moneyTransfers = _moneyTransferLogic.ReadList(new MoneyTransferSearchModel()
|
||||
|
@ -26,6 +26,9 @@
|
||||
<th>
|
||||
Номер счёта
|
||||
</th>
|
||||
<th>
|
||||
Баланс
|
||||
</th>
|
||||
<th>
|
||||
CVC
|
||||
</th>
|
||||
@ -41,6 +44,9 @@
|
||||
<td>
|
||||
@Html.DisplayFor(modelItem => item.Number)
|
||||
</td>
|
||||
<td>
|
||||
@Html.DisplayFor(modelItem => item.Sum)
|
||||
</td>
|
||||
<td>
|
||||
@Html.DisplayFor(modelItem => item.CVC)
|
||||
</td>
|
||||
|
@ -1,4 +1,5 @@
|
||||
using BankYouBankruptDataModels.Models;
|
||||
using BankYouBankruptDataModels.Enums;
|
||||
using BankYouBankruptDataModels.Models;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
@ -14,6 +15,8 @@ namespace BankYouBankruptContracts.ViewModels
|
||||
|
||||
public int DebitingId { get; set; }
|
||||
|
||||
public StatusEnum DebitingStatus { get; set; }
|
||||
|
||||
[DisplayName("Номер заявки на снятие средств")]
|
||||
public int DebbitingNumber { get; set; }
|
||||
|
||||
|
@ -22,6 +22,9 @@ namespace BankYouBankruptContracts.ViewModels.Client.Default
|
||||
[DisplayName("Номер карты")]
|
||||
public string Number { get; set; } = string.Empty;
|
||||
|
||||
[DisplayName("Баланс карты")]
|
||||
public double Sum { get; set; }
|
||||
|
||||
public string CVC { get; set; } = string.Empty;
|
||||
|
||||
[DisplayName("Период действия")]
|
||||
|
@ -24,6 +24,8 @@ namespace BankYouBankruptDatabaseImplement.Models
|
||||
[Required]
|
||||
public int AccountId { get; set; }
|
||||
|
||||
public virtual Account Account { get; set; }
|
||||
|
||||
[Required]
|
||||
public string Number { get; set; } = string.Empty;
|
||||
|
||||
@ -46,6 +48,7 @@ namespace BankYouBankruptDatabaseImplement.Models
|
||||
ClientID = ClientID,
|
||||
ClientSurname = Client.Surname,
|
||||
Number = Number,
|
||||
Sum = Account.Balance,
|
||||
Period = Period,
|
||||
CVC = CVC
|
||||
};
|
||||
@ -56,6 +59,7 @@ namespace BankYouBankruptDatabaseImplement.Models
|
||||
{
|
||||
Id = model.Id,
|
||||
AccountId = model.AccountId,
|
||||
Account = context.Accounts.First(x => x.Id == model.AccountId),
|
||||
ClientID = model.ClientID,
|
||||
Client = context.Clients.First(x => x.Id == model.ClientID),
|
||||
Number = model.Number,
|
||||
|
@ -69,6 +69,7 @@ namespace BankYouBankruptDatabaseImplement.Models
|
||||
AccountNumber = Account.AccountNumber,
|
||||
SurmaneCashier = Cashier.Surname,
|
||||
DebbitingNumber = Debiting.Id,
|
||||
DebitingStatus = Debiting.Status,
|
||||
Sum = Sum,
|
||||
DateOperation = DateOperation
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user