feat(dal,api): удалены таблицы которые относились к старому JobAutoControl. Добавлена новая таблица JobAutoControl

This commit is contained in:
Mikhail Trubnikov
2025-12-05 14:07:48 +10:00
parent 8541d7495b
commit 54ccd2e8e3
26 changed files with 8446 additions and 725 deletions

View File

@@ -322,18 +322,18 @@ namespace PARR.API.MappingProfiles
#region ApplicationInWork
CreateMap<ApplicationsInWork, ApplicationInWorkBaseResponse>()
.Include<ApplicationsInWork, ApplicationInWorkResponse>()
.ForMember(d => d.Application, o => o.MapFrom(s => s.Application));
//CreateMap<ApplicationsInWork, ApplicationInWorkBaseResponse>()
// .Include<ApplicationsInWork, ApplicationInWorkResponse>()
// .ForMember(d => d.Application, o => o.MapFrom(s => s.Application));
CreateMap<ApplicationsInWork, ApplicationInWorkBaseResponse>();
//CreateMap<ApplicationsInWork, ApplicationInWorkBaseResponse>();
CreateMap<ApplicationsInWork, ApplicationInWorkResponse>()
.ForMember(d => d.Work, o => o.MapFrom(s => s.Work))
//.ForMember(d => d.TemplatesCount, o => o.MapFrom(s => s.Templates.Count()))
.ForMember(d => d.Schedule, o => o.MapFrom<ApplicationInWorkScheduleResolver>())
.ForMember(d => d.WorkGroups, o => o.MapFrom(s => s.WorkGroups.OrderBy(t => t.WorkGroup!.Name).Select(t => t.WorkGroup)))
.ForMember(d => d.AutoControl, o => o.MapFrom(s => s.JobAutoControl));
//CreateMap<ApplicationsInWork, ApplicationInWorkResponse>()
// .ForMember(d => d.Work, o => o.MapFrom(s => s.Work))
// //.ForMember(d => d.TemplatesCount, o => o.MapFrom(s => s.Templates.Count()))
// .ForMember(d => d.Schedule, o => o.MapFrom<ApplicationInWorkScheduleResolver>())
// .ForMember(d => d.WorkGroups, o => o.MapFrom(s => s.WorkGroups.OrderBy(t => t.WorkGroup!.Name).Select(t => t.WorkGroup)))
// .ForMember(d => d.AutoControl, o => o.MapFrom(s => s.JobAutoControl));
#endregion
@@ -375,24 +375,24 @@ namespace PARR.API.MappingProfiles
#endregion
#region JobAutoControl
//#region JobAutoControl
CreateMap<JobAutoControl, JobAutoControlBaseResponse>()
.Include<JobAutoControl, JobAutoControlResponse>();
//CreateMap<JobAutoControl, JobAutoControlBaseResponse>()
// .Include<JobAutoControl, JobAutoControlResponse>();
CreateMap<JobAutoControl, JobAutoControlResponse>()
.ForMember(d => d.EkMasks, o => o.MapFrom(s => s.JobEkMasks.OrderBy(t => t.Name)))
.ForMember(d => d.EnabledEkStatuses, o => o.MapFrom(s => s.JobAutoControlInEkStatuses.Select(t => t.EkStatus).OrderBy(t => t.Name)))
.ForMember(d => d.WorkGroups, o => o.MapFrom(s => s.ApplicationsInWork!.WorkGroups.Select(t => t.WorkGroup).OrderBy(t => t.Name)));
//CreateMap<JobAutoControl, JobAutoControlResponse>()
// .ForMember(d => d.EkMasks, o => o.MapFrom(s => s.JobEkMasks.OrderBy(t => t.Name)))
// .ForMember(d => d.EnabledEkStatuses, o => o.MapFrom(s => s.JobAutoControlInEkStatuses.Select(t => t.EkStatus).OrderBy(t => t.Name)))
// .ForMember(d => d.WorkGroups, o => o.MapFrom(s => s.ApplicationsInWork!.WorkGroups.Select(t => t.WorkGroup).OrderBy(t => t.Name)));
#endregion
//#endregion
#region ResponseArea
CreateMap<ResponseArea, ResponseAreaResponse>();
#endregion
CreateMap<JobEkMask, JobEkMaskResponse>();
//CreateMap<JobEkMask, JobEkMaskResponse>();
CreateMap<EkStatus, EkStatusResponse>();