From 4cde851a3376cab79595853a887398bc302228ee Mon Sep 17 00:00:00 2001 From: Mikhail Kuznetsov Date: Tue, 19 Sep 2023 10:19:05 +1000 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=BC=D0=BE=D0=B4=D0=B5?= =?UTF-8?q?=D0=BB=D0=B5=D0=B9=20Host,=20Template?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AIHIT/MappingProfiles/RequestToDomain.cs | 5 +++-- PARR.DAL/Models/Host.cs | 5 ++--- PARR.DAL/Models/Template.cs | 21 +++++++++++-------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/PARR.AIHIT/AIHIT/MappingProfiles/RequestToDomain.cs b/PARR.AIHIT/AIHIT/MappingProfiles/RequestToDomain.cs index 08243a29..d12c7f24 100644 --- a/PARR.AIHIT/AIHIT/MappingProfiles/RequestToDomain.cs +++ b/PARR.AIHIT/AIHIT/MappingProfiles/RequestToDomain.cs @@ -21,10 +21,11 @@ namespace PARR.AIHIT.MappingProfiles .ForMember(d => d.Responsible, o => o.MapFrom(s => s.Attributes!["ОТВЕТСТВЕННЫЙ_ЗА_ЭК"]!.Value.Trim())); CreateMap() - .ForMember(d => d.HostName, o => o.MapFrom(s => s.EKFindCode))//TODO Определить имя хоста по + .ForMember(d => d.Ek, o => o.MapFrom(s => s.EKFindCode))//TODO Определить имя хоста по .ForMember(d => d.IP, o => o.MapFrom(s => s.IP)) .ForMember(d => d.Status, o => o.MapFrom(s => s.Status)) - .ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.WorkGroup)); + .ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.WorkGroup)) + .ForMember(d => d.ResponseArea, o => o.MapFrom(s => s.ResponseArea)); //CreateMap() // .ForMember(d => d.HostName, o => o.MapFrom(s => s.HostName)) // .ForMember(d => d.IP, o => o.MapFrom(s => s.IP)) diff --git a/PARR.DAL/Models/Host.cs b/PARR.DAL/Models/Host.cs index 322bd43b..7c1ddca8 100644 --- a/PARR.DAL/Models/Host.cs +++ b/PARR.DAL/Models/Host.cs @@ -11,14 +11,13 @@ namespace PARR.DAL.Models public Guid Id { get; set; } public DateTimeOffset DateCreated { get; set; } public DateTimeOffset? DateModified { get; set; } - public string? HostName { get; set; } + public string? Ek { get; set; } public required string IP { get; set; } //public string? RegionalEK { get; set; } //public string? LinkEK { get; set; } public string? Status { get; set; } public string? WorkGroup { get; set; } - //public string? Responsible { get; set; } - + public string? ResponseArea { get; set; } public ICollection ApplicationsInHosts { get; set; } = new HashSet(); diff --git a/PARR.DAL/Models/Template.cs b/PARR.DAL/Models/Template.cs index 654f67bd..452bd24c 100644 --- a/PARR.DAL/Models/Template.cs +++ b/PARR.DAL/Models/Template.cs @@ -20,31 +20,34 @@ namespace PARR.DAL.Models public bool IsActive { get; set; } - //??? Рабочая группа + //Рабочая группа из Host public required string WorkGroup { get; set; } + // settings из Work public required string ShortDescription { get; set; } - //settings ? регламентная работа + //settings регламентная работа. не меняется public required string Category { get; set; } - // ДВС, ?? + // из Host public required string ResponseArea { get; set; } - //works ?? - public required string Duration { get; set; } + //works + public required string EsppDuration { get; set; } + //works + public required string EsppStartAt { get; set; } //public required string EK { get; set; } - // settings + // settings. Возможно руководитель повыше public required string Initiator { get; set; } - + // settings из Work public required string FullDescription { get; set; } - // settings + // settings public required string ClosingCode { get; set; } - // settings + // settings из Work public required string Solution { get; set; } //public required string Process { get; set; }