Добавил реализацию информации о клиенте в заказе в списочное хранилизе и файловое хранилище

This commit is contained in:
Никита Потапов 2024-04-06 23:54:12 +04:00
parent 2bff37f117
commit 645cdb306f
4 changed files with 10 additions and 9 deletions

View File

@ -41,6 +41,10 @@ namespace SecuritySystemFileImplement.Implements
{ {
orders = orders.Where(x => x.DateCreate <= model.DateTo.Value).ToList(); orders = orders.Where(x => x.DateCreate <= model.DateTo.Value).ToList();
} }
if (model.ClientId.HasValue)
{
orders = orders.Where(x => x.ClientId == model.ClientId.Value).ToList();
}
return orders; return orders;
} }

View File

@ -10,6 +10,7 @@ namespace SecuritySystemFileImplement.Models
{ {
public int Id { get; private set; } public int Id { get; private set; }
public int SecureId { get; private set; } public int SecureId { get; private set; }
public int ClientId { get; private set; }
public int Count { get; private set; } public int Count { get; private set; }
public double Sum { get; private set; } public double Sum { get; private set; }
public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;

View File

@ -39,6 +39,10 @@ namespace SecuritySystemListImplement.Implements
{ {
orders = orders.Where(x => x.DateCreate <= model.DateTo.Value).ToList(); orders = orders.Where(x => x.DateCreate <= model.DateTo.Value).ToList();
} }
if (model.ClientId.HasValue)
{
orders = orders.Where(x => x.ClientId == model.ClientId.Value).ToList();
}
return orders; return orders;
} }
public OrderViewModel? GetElement(OrderSearchModel model) public OrderViewModel? GetElement(OrderSearchModel model)

View File

@ -7,19 +7,13 @@ namespace SecuritySystemListImplement.Models
public class Order public class Order
{ {
public int SecureId { get; private set; } public int SecureId { get; private set; }
public int ClientId { get; private set; }
public int Count { get; private set; } public int Count { get; private set; }
public double Sum { get; private set; } public double Sum { get; private set; }
public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
public DateTime DateCreate { get; private set; } = DateTime.Now; public DateTime DateCreate { get; private set; } = DateTime.Now;
public DateTime? DateImplement { get; private set; } public DateTime? DateImplement { get; private set; }
public int Id { get; private set; } public int Id { get; private set; }
public static Order? Create(OrderBindingModel? model) public static Order? Create(OrderBindingModel? model)
{ {
if (model == null) if (model == null)
@ -37,7 +31,6 @@ namespace SecuritySystemListImplement.Models
DateImplement = model.DateImplement, DateImplement = model.DateImplement,
}; };
} }
public void Update(OrderBindingModel? model) public void Update(OrderBindingModel? model)
{ {
if (model == null) if (model == null)
@ -47,7 +40,6 @@ namespace SecuritySystemListImplement.Models
Status = model.Status; Status = model.Status;
DateImplement = model.DateImplement; DateImplement = model.DateImplement;
} }
public OrderViewModel GetViewModel => new() public OrderViewModel GetViewModel => new()
{ {
SecureId = SecureId, SecureId = SecureId,