From 7e8c553c87716211b08229961dbbd2d24c44b25c Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Tue, 18 Jun 2024 15:16:54 +1000 Subject: [PATCH] =?UTF-8?q?feat(esppTemplateSync):=20=D0=97=D0=9E=20=D0=B1?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D1=82=D1=81=D1=8F=20=D0=B8=D0=B7=20=D0=97?= =?UTF-8?q?=D0=9E=20=D0=A0=D0=93,=20=D0=B0=20=D0=BD=D0=B5=20=D0=B8=D0=B7?= =?UTF-8?q?=20=D0=97=D0=9E=20=D1=85=D0=BE=D1=81=D1=82=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.DAL/Services/Implementations/TemplateService.cs | 1 + PARR.EsppTemplateSync/TemplateMQSyncer.cs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/PARR.DAL/Services/Implementations/TemplateService.cs b/PARR.DAL/Services/Implementations/TemplateService.cs index be619545..206215dd 100644 --- a/PARR.DAL/Services/Implementations/TemplateService.cs +++ b/PARR.DAL/Services/Implementations/TemplateService.cs @@ -38,6 +38,7 @@ namespace PARR.DAL.Services.Implementations .ThenInclude(t => t!.ResponseArea) .Include(h => h.Host) .ThenInclude(t => t!.WorkGroup) + .ThenInclude(t => t!.ResponseArea) .Include(h => h.Host) .ThenInclude(t => t!.EkStatus) .Include(a => a.ApplicationsInWork) diff --git a/PARR.EsppTemplateSync/TemplateMQSyncer.cs b/PARR.EsppTemplateSync/TemplateMQSyncer.cs index 14f6be08..7785f8a0 100644 --- a/PARR.EsppTemplateSync/TemplateMQSyncer.cs +++ b/PARR.EsppTemplateSync/TemplateMQSyncer.cs @@ -76,7 +76,9 @@ namespace PARR.EsppTemplateSync //WorkGroup = template.Host!.WorkGroup!, WorkGroup = template.Host!.WorkGroup!.Name, ShortDescription = Normalize(template.ApplicationsInWork!.ShortDescription), - ResponseArea = template.Host!.ResponseArea!.Name, + //ResponseArea = template.Host!.ResponseArea!.Name, + //ЗО берем РГ а не хоста + ResponseArea = template.Host!.WorkGroup!.ResponseArea!.Name, Duration = template.ApplicationsInWork.TemplateDuration, EK = template.Host.Ek, FullDescription = Normalize(template.ApplicationsInWork.FullDescription),