strwbrry/PIBD-23_Matvienko_S.D._Publishing_Simple
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
strwbrry1 2024-12-25 04:10:15 +04:00
parent 42762d88aa
commit 26787687f4
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ProjectPublishing/ProjectPublishing/Entities/Order.cs
View File

@ -30,11 +30,13 @@ namespace ProjectPublishing.Entities
[Browsable(false)] [Browsable(false)]
public int CustomerId { get; private set; } public int CustomerId { get; private set; }
[DisplayName("Имя покупателя")]
public string CustomerName { get; private set; } = string.Empty; public string CustomerName { get; private set; } = string.Empty;
[Browsable(false)] [Browsable(false)]
public int PrintingId { get; private set; } public int PrintingId { get; private set; }
[DisplayName("Название типографии")]
public string PrintingName { get; private set; } = string.Empty; public string PrintingName { get; private set; } = string.Empty;
[Browsable(false)] [Browsable(false)]

5
ProjectPublishing/ProjectPublishing/Entities/TempOrderMaterials.cs
View File

@ -28,5 +28,10 @@ namespace ProjectPublishing.Entities
public int MaterialsId { get; private set; } public int MaterialsId { get; private set; }
public int MaterialsAmount { get; private set; } public int MaterialsAmount { get; private set; }
public string CustomerName { get; private set; } = string.Empty;
public string PrintingName { get; private set; } = string.Empty;
} }
} }

15
ProjectPublishing/ProjectPublishing/Repositories/Implementations/OrderRepository.cs
View File

@ -90,22 +90,19 @@ WHERE Id=@id";
var querySelect = @" var querySelect = @"
SELECT o.*, SELECT o.*,
ma.MaterialId as MaterialsId, ma.MaterialId as MaterialsId,
ma.Amount as MaterialsAmount ma.Amount as MaterialsAmount,
CONCAT(c.LastName, ' ', c.FirstName) as CustomerName,
ph.Name as PrintingName ph.Name as PrintingName
CONCAT(c.FirstName, ' ', c.LastName) as CustomerName
FROM PrintingOrder o FROM PrintingOrder o
LEFT JOIN OrderMaterials ma ON o.Id = ma.OrderId LEFT JOIN OrderMaterials ma ON o.Id = ma.OrderId
LEFT JOIN Customer c ON o.CustomerId = c.Id LEFT JOIN Customer c ON o.CustomerId = c.Id
LEFT JOIN PrintingHouse ph ON o.PrintingId = ph.Id LEFT JOIN PrintingHouse ph ON o.PrintingId = ph.Id
"; "; // возможно сюда фикс
// var printingOrders = connection.Query<TempOrderMaterials>(querySelect); var printingOrders = connection.Query<TempOrderMaterials>(querySelect);
var orderDict = new Dictionary<int, List<OrderMaterials>>();
var printingOrders = connection.Query<Order>(querySelect);
_logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(printingOrders)); _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(printingOrders));
return printingOrders.ToList(); return printingOrders.GroupBy(x => x.Id, y => y, (key, value) =>
Order.CreateOrder(value.First(), value.Select(z => OrderMaterials.Create(0, z.MaterialsId, z.MaterialsAmount)))).ToList();
} }
catch (Exception ex) catch (Exception ex)
{ {