b0n3l3sS/PIbd-23_Mochalov_D.V._LawFirm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mochalov D.V. LabWork06_Base #10

Closed
b0n3l3sS wants to merge 14 commits from LabWork06_Base into LabWork05_Base
pull from: LabWork06_Base
merge into: b0n3l3sS:LabWork05_Base
Conversation 1 Commits 14 Files Changed 44 +13 -13
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e5e0cddc9b - Show all commits

2
LawFirm/LawFirmBusinessLogic/BusinessLogics/WorkModeling.cs
View File

@ -35,7 +35,7 @@ namespace LawFirmBusinessLogic.BusinessLogics
_logger.LogWarning("DoWork. Implementers is null");
return;
}
var orders = _orderLogic.ReadList(new OrderSearchModel { Statuses = new() { OrderStatus.Принят, OrderStatus.Выполняется } });
var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Принят });
if (orders == null || orders.Count == 0)
{
_logger.LogWarning("DoWork. Orders is null or empty");

2
LawFirm/LawFirmContracts/SearchModels/OrderSearchModel.cs
View File

@ -14,6 +14,6 @@ namespace LawFirmContracts.SearchModels
public DateTime? DateTo { get; set; }
public int? ClientId { get; set; }
public int? ImplementerId { get; set; }
public List<OrderStatus>? Statuses { get; set; }
public OrderStatus Status { get; set; }
}
}

8
LawFirm/LawFirmDatabaseImplement/Implements/OrderStorage.cs
View File

@ -26,14 +26,14 @@ namespace LawFirmDatabaseImplement.Implements
.Include(x => x.Client)
.Include(x => x.Implementer)
.FirstOrDefault(x =>
(model.Statuses == null || model.Statuses != null && model.Statuses.Contains(x.Status)) &&
(model.Status == null || model.Status != null && model.Status.Equals(x.Status)) &&
model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId ||
model.Id.HasValue && x.Id == model.Id)?.GetViewModel;
}
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue && !model.ClientId.HasValue && model.Statuses == null)
if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue && !model.ClientId.HasValue && model.Status == null)
{
return new();
}
@ -47,12 +47,12 @@ namespace LawFirmDatabaseImplement.Implements
.Select(x => x.GetViewModel)
.ToList();
}
if (model.Statuses!= null)
if (model.Status!= null)
{
return context.Orders
.Include(x => x.Client)
.Include(x => x.Implementer)
.Where(x => model.Statuses.Contains(x.Status))
.Where(x => model.Status.Equals(x.Status))
.Select(x => x.GetViewModel)
.ToList();
}

8
LawFirm/LawFirmFileImplement/Implements/OrderStorage.cs
View File

@ -22,7 +22,7 @@ namespace LawFirmFileImplement.Implements
public OrderViewModel? GetElement(OrderSearchModel model)
{
if (model.ImplementerId.HasValue && model.Statuses != null) return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId && model.Statuses.Contains(x.Status))?.GetViewModel;
if (model.ImplementerId.HasValue && model.Status != null) return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId && model.Status.Equals(x.Status))?.GetViewModel;
if (model.ImplementerId.HasValue)
{
return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
@ -36,7 +36,7 @@ namespace LawFirmFileImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue && !model.ClientId.HasValue && model.Statuses == null)
if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue && !model.ClientId.HasValue && model.Status == null)
{
return new();
}
@ -47,10 +47,10 @@ namespace LawFirmFileImplement.Implements
.Select(x => x.GetViewModel)
.ToList();
}
if (model.Statuses != null)
if (model.Status != null)
{
return source.Orders
.Where(x => model.Statuses.Contains(x.Status))
.Where(x => model.Status.Equals(x.Status))
.Select(x => x.GetViewModel)
.ToList();
}

6
LawFirm/LawFirmListImplements/Implements/OrderStorage.cs
View File

@ -32,7 +32,7 @@ namespace LawFirmListImplements.Implements
{
return GetViewModel(order);
}
else if (model.ImplementerId.HasValue && model.Statuses != null && order.ImplementerId == model.ImplementerId && model.Statuses.Contains(order.Status))
else if (model.ImplementerId.HasValue && model.Status != null && order.ImplementerId == model.ImplementerId && model.Status.Equals(order.Status))
{
return GetViewModel(order);
}
@ -77,11 +77,11 @@ namespace LawFirmListImplements.Implements
}
}
}
if (model.Statuses != null)
if (model.Status != null)
{
foreach (var order in _source.Orders)
{
if (model.Statuses.Contains(order.Status))
if (model.Status.Equals(order.Status))
{
result.Add(GetViewModel(order));
}