From c82aab9dd467089f73221e1bfc18944e929507fa Mon Sep 17 00:00:00 2001 From: hardstylewyl <827778732@qq.com> Date: Wed, 26 Mar 2025 15:15:06 +0800 Subject: [PATCH] =?UTF-8?q?change-params:=E8=8E=B7=E5=8F=96=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=E9=A2=84=E8=AD=A6=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E8=BD=A8=E8=BF=B9=E5=8F=82=E6=95=B0=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=9B=B4=E6=94=B9V2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Warning/Complete/CompleteWarningDetailsDto.cs | 2 +- .../Services/Warning/CompleteWarningService.cs | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) 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(); } // 格式化时区