d.agliullov/ISEbd-21_Agliullov.D.A._Confectionery
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Изменена имитация работы исполнителя

Browse Source
This commit is contained in:
Данияр Аглиуллов 2023-03-06 18:30:09 +04:00
parent fb5507c55c
commit e3682318d3
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ConfectionaryBusinessLogic/WorkModeling.cs
View File

@ -38,8 +38,17 @@ namespace ConfectioneryBusinessLogic
var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Принят }); var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Принят });
if (orders == null || orders.Count == 0) if (orders == null || orders.Count == 0)
{ {
_logger.LogWarning("DoWork. Orders is null or empty"); var workingOrders = _orderLogic.ReadList(new() { Status = OrderStatus.Выполняется });
return; if (workingOrders == null || workingOrders.Count == 0)
{
_logger.LogWarning("DoWork. Orders is null or empty");
return;
}
else
{
_logger.LogWarning("DoWork. Еще есть заказы в работе");
orders = workingOrders;
}
} }
_logger.LogDebug("DoWork for {Count} orders", orders.Count); _logger.LogDebug("DoWork for {Count} orders", orders.Count);
foreach (var implementer in implementers) foreach (var implementer in implementers)

7
ConfectioneryDatabaseImplement/OrderStorage.cs
View File

@ -28,11 +28,12 @@ namespace ConfectioneryDatabaseImplement.Implements
public OrderViewModel? GetElement(OrderSearchModel model) public OrderViewModel? GetElement(OrderSearchModel model)
{ {
using var context = new ConfectioneryDatabase(); using var context = new ConfectioneryDatabase();
// Находим первого либо по айди заказа, либо по айди исполнителя, исходя из того что есть в модели // Находим первого либо по айди заказа, либо по айди исполнителя, либо по айди исполнителя и статусу заказа, исходя из того что есть в модели
return context.Orders return context.Orders
.Include(x => x.Client) .Include(x => x.Client)
.Include(x => x.Implementer) .Include(x => x.Implementer)
.FirstOrDefault(x => .FirstOrDefault(x =>
(!model.Status.HasValue || model.Status.HasValue && x.Status == model.Status) &&
model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId || model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId ||
model.Id.HasValue && x.Id == model.Id model.Id.HasValue && x.Id == model.Id
) )
@ -56,10 +57,6 @@ namespace ConfectioneryDatabaseImplement.Implements
.Where(x => model.DateFrom <= x.DateCreate.Date && .Where(x => model.DateFrom <= x.DateCreate.Date &&
x.DateCreate.Date <= model.DateTo); x.DateCreate.Date <= model.DateTo);
} }
else if (model.Status.HasValue && model.ImplementerId.HasValue)
{
queryWhere = context.Orders.Where(x => x.ImplementerId == model.ImplementerId && x.Status == model.Status);
}
else if (model.Status.HasValue) else if (model.Status.HasValue)
{ {
queryWhere = context.Orders.Where(x => x.Status == model.Status); queryWhere = context.Orders.Where(x => x.Status == model.Status);