diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs index 39285568..ec2c9802 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Complete/CompleteWarningDetailsDto.cs @@ -61,7 +61,7 @@ public class CompleteWarningDetailsDto /// /// 缺失轨迹状态 e.g [ {1:"状态1",2:"状态2"} , {3:"状态3",4:"状态4"} ] /// - public List> MissingTrackStatus { get; set; } + public List MissingTrackStatus { get; set; } //视图属性 tips:从es即时拿取 diff --git a/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs b/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs index aed5db94..43162cde 100644 --- a/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs +++ b/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs @@ -214,11 +214,20 @@ public class CompleteWarningService : ApplicationService } // 构建缺失轨迹状态 - List> BuildMissingTrackStatus(CompleteWarningDetailsIndex detail) + List BuildMissingTrackStatus(CompleteWarningDetailsIndex detail) { + // return detail.GetMissingTrackStatusIdGroups() + // .Select(g => g.ToDictionary(id => id.ToString(), id => trackStatusDict.GetValueOrDefault(id, GlobalConst.EmptyString))) + // .ToList(); return detail.GetMissingTrackStatusIdGroups() - .Select(g => g.ToDictionary(id => id.ToString(), id => trackStatusDict.GetValueOrDefault(id, GlobalConst.EmptyString))) - .ToList(); + .Select(g => new RequireTrackStatusItem + { + Statuses = g.Select(id => new TrackStatusDto + { + TrackStatusId = id, + TrackStatus = trackStatusDict.GetValueOrDefault(id, GlobalConst.EmptyString) + }).ToList() + }).ToList(); } // 格式化时区