diff --git a/ProjectPublishing/ProjectPublishing/Entities/Order.cs b/ProjectPublishing/ProjectPublishing/Entities/Order.cs index e860063..db2a7c9 100644 --- a/ProjectPublishing/ProjectPublishing/Entities/Order.cs +++ b/ProjectPublishing/ProjectPublishing/Entities/Order.cs @@ -30,11 +30,13 @@ namespace ProjectPublishing.Entities [Browsable(false)] public int CustomerId { get; private set; } + [DisplayName("Имя покупателя")] public string CustomerName { get; private set; } = string.Empty; [Browsable(false)] public int PrintingId { get; private set; } + [DisplayName("Название типографии")] public string PrintingName { get; private set; } = string.Empty; [Browsable(false)] diff --git a/ProjectPublishing/ProjectPublishing/Entities/TempOrderMaterials.cs b/ProjectPublishing/ProjectPublishing/Entities/TempOrderMaterials.cs index c680def..0dd59aa 100644 --- a/ProjectPublishing/ProjectPublishing/Entities/TempOrderMaterials.cs +++ b/ProjectPublishing/ProjectPublishing/Entities/TempOrderMaterials.cs @@ -28,5 +28,10 @@ namespace ProjectPublishing.Entities public int MaterialsId { 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; + } } diff --git a/ProjectPublishing/ProjectPublishing/Repositories/Implementations/OrderRepository.cs b/ProjectPublishing/ProjectPublishing/Repositories/Implementations/OrderRepository.cs index 3426c5f..3df328f 100644 --- a/ProjectPublishing/ProjectPublishing/Repositories/Implementations/OrderRepository.cs +++ b/ProjectPublishing/ProjectPublishing/Repositories/Implementations/OrderRepository.cs @@ -90,22 +90,19 @@ WHERE Id=@id"; var querySelect = @" SELECT o.*, ma.MaterialId as MaterialsId, -ma.Amount as MaterialsAmount +ma.Amount as MaterialsAmount, +CONCAT(c.LastName, ' ', c.FirstName) as CustomerName, ph.Name as PrintingName -CONCAT(c.FirstName, ' ', c.LastName) as CustomerName FROM PrintingOrder o LEFT JOIN OrderMaterials ma ON o.Id = ma.OrderId LEFT JOIN Customer c ON o.CustomerId = c.Id LEFT JOIN PrintingHouse ph ON o.PrintingId = ph.Id -"; - // var printingOrders = connection.Query(querySelect); - var orderDict = new Dictionary>(); - var printingOrders = connection.Query(querySelect); - - +"; // возможно сюда фикс + var printingOrders = connection.Query(querySelect); _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) {