From 7a1b7fb72a57824da8d4abe7335354c01f55a7ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B3=D0=BE=D1=80=20=D0=9F=D1=8B=D0=B6=D0=BE=D0=B2?= Date: Sun, 15 Dec 2024 02:49:07 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BA=D0=BE=D1=80=D0=B5?= =?UTF-8?q?=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ITServiceManager/ITServiceManager/Entities/Service.cs | 4 +++- .../Repositories/Implementations/OrderRepository.cs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ITServiceManager/ITServiceManager/Entities/Service.cs b/ITServiceManager/ITServiceManager/Entities/Service.cs index bab84a6..d69cd25 100644 --- a/ITServiceManager/ITServiceManager/Entities/Service.cs +++ b/ITServiceManager/ITServiceManager/Entities/Service.cs @@ -10,8 +10,10 @@ public class Service [DisplayName("Тип услуги")] public ServiceType ServiceType { get; private set; } - [DisplayName("Описание")] + [DisplayName("Название услуги")] public string ServiceName { get; private set; } = string.Empty; + + [DisplayName("Описание")] public string Description { get; private set; } = string.Empty; public static Service CreateEntity(int id, ServiceType type, string name, string description) diff --git a/ITServiceManager/ITServiceManager/Repositories/Implementations/OrderRepository.cs b/ITServiceManager/ITServiceManager/Repositories/Implementations/OrderRepository.cs index ab99d84..b322bc9 100644 --- a/ITServiceManager/ITServiceManager/Repositories/Implementations/OrderRepository.cs +++ b/ITServiceManager/ITServiceManager/Repositories/Implementations/OrderRepository.cs @@ -36,7 +36,7 @@ public class OrderRepository : IOrderRepository } using var connection = new NpgsqlConnection(_connectionString.ConnectionString); var querySelect = @$" - SELECT o.*, c.Name as CompanyName, os.serviceId, os.quantity, s.ServiceType as ServiceName + SELECT o.*, c.Name as CompanyName, os.serviceId, os.quantity, s.ServiceName as ServiceName FROM Orders AS o LEFT JOIN Companies c on c.Id = o.CompanyId INNER JOIN Order_Service AS os ON o.id = os.orderId