fix(esppTemplateSyncer): рабочая группа возращалась из ЭК, а правильно из маски работы
This commit is contained in:
@@ -16,7 +16,6 @@ namespace PARR.EsppTemplateSync
|
|||||||
private readonly SettingsFromDb settingsFromDb;
|
private readonly SettingsFromDb settingsFromDb;
|
||||||
private readonly ISyncService<EsppObjectTemplate> syncService;
|
private readonly ISyncService<EsppObjectTemplate> syncService;
|
||||||
|
|
||||||
//private readonly IServiceProvider serviceProvider;
|
|
||||||
|
|
||||||
public TemplateMQSyncer(
|
public TemplateMQSyncer(
|
||||||
ILogger<TemplateMQSyncer> logger,
|
ILogger<TemplateMQSyncer> logger,
|
||||||
@@ -24,7 +23,6 @@ namespace PARR.EsppTemplateSync
|
|||||||
IMqService mqService,
|
IMqService mqService,
|
||||||
SettingsFromDb settingsFromDb,
|
SettingsFromDb settingsFromDb,
|
||||||
ISyncService<EsppObjectTemplate> syncService
|
ISyncService<EsppObjectTemplate> syncService
|
||||||
//IServiceProvider serviceProvider
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
@@ -32,7 +30,7 @@ namespace PARR.EsppTemplateSync
|
|||||||
this.mqService = mqService;
|
this.mqService = mqService;
|
||||||
this.settingsFromDb = settingsFromDb;
|
this.settingsFromDb = settingsFromDb;
|
||||||
this.syncService = syncService;
|
this.syncService = syncService;
|
||||||
//this.serviceProvider = serviceProvider;
|
|
||||||
if (globalSettings.MqSettings == null)
|
if (globalSettings.MqSettings == null)
|
||||||
{
|
{
|
||||||
logger.LogError("Нет секции настроек хранилища. MqSettings, EsppTemplates");
|
logger.LogError("Нет секции настроек хранилища. MqSettings, EsppTemplates");
|
||||||
@@ -86,12 +84,13 @@ namespace PARR.EsppTemplateSync
|
|||||||
TemplateName = template.Name.ToUpper(),
|
TemplateName = template.Name.ToUpper(),
|
||||||
IsActive = template.IsActiveTemplate,
|
IsActive = template.IsActiveTemplate,
|
||||||
//WorkGroup = template.Host!.WorkGroup!,
|
//WorkGroup = template.Host!.WorkGroup!,
|
||||||
WorkGroup = template.Unit!.BaseFields!.WorkGroup!,
|
//WorkGroup = template.Unit!.BaseFields!.WorkGroup!,
|
||||||
|
WorkGroup = template.Job!.WorkGroupMask,
|
||||||
//ShortDescription = Normalize(template.Job.Group.ShortDescription.ApplyShortcode(Constants.Shortcodes.ShortcodeEnum.EK,template.Unit.Name)),
|
//ShortDescription = Normalize(template.Job.Group.ShortDescription.ApplyShortcode(Constants.Shortcodes.ShortcodeEnum.EK,template.Unit.Name)),
|
||||||
ShortDescription = template.Job!.Group!.ShortDescription,//TODO Вынести в переменную
|
ShortDescription = template.Job!.Group!.ShortDescription,//TODO Вынести в переменную
|
||||||
//ResponseArea = template.Host!.ResponseArea!.Name,
|
//ResponseArea = template.Host!.ResponseArea!.Name,
|
||||||
//ЗО берем РГ а не хоста
|
//ЗО берем РГ а не хоста
|
||||||
ResponseArea = template.Unit.BaseFields.ResponseArea!,
|
ResponseArea = template.Unit!.BaseFields!.ResponseArea!,
|
||||||
Duration = template.Job.Group.TemplateDuration,
|
Duration = template.Job.Group.TemplateDuration,
|
||||||
EK = template.Unit.Name,
|
EK = template.Unit.Name,
|
||||||
FullDescription = template.Job.Group.FullDescription,
|
FullDescription = template.Job.Group.FullDescription,
|
||||||
|
|||||||
Reference in New Issue
Block a user