ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'S06' into test

Browse Source
This commit is contained in:
云龙 王 2024-11-27 15:27:30 +08:00
commit 66cc15bd9f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
View File

@ -205,13 +205,18 @@ public class TrackOrderService : ApplicationService
if (system.SystemProperty == 2 && !item.IsVisibility) if (system.SystemProperty == 2 && !item.IsVisibility)
continue; continue;
//时间和时区任意一个为空则使用创建时间做为排序参照值
var timeTick = ToUnixTimestamp((item.TrackTime == null
|| Math.Abs(item.TrackTimeZone - GlobalConst.NoneTrackTimeZone) < 1)
? item.CreateTime
: item.TrackTime);
res.Data.Add(new GetDetailTimelineOutput() res.Data.Add(new GetDetailTimelineOutput()
{ {
IsHighlight = true, IsHighlight = true,
IsShowHover = true, IsShowHover = true,
Remark = item.Remarks == null || item.Remarks == "--" ? "" : item.Remarks, Remark = item.Remarks == null || item.Remarks == "--" ? "" : item.Remarks,
TrackTimeZone = $"GMT{(item.TrackTimeZone >= 0 ? "+" : "-")}{GetTimeZoneStr(item.TrackTimeZone)}", TrackTimeZone = $"GMT{(item.TrackTimeZone >= 0 ? "+" : "-")}{GetTimeZoneStr(item.TrackTimeZone)}",
TrackTime = ToUnixTimestamp(item.TrackTime), TrackTime = timeTick,
TrackPlace = item.TrackPlace, TrackPlace = item.TrackPlace,
EnContent = item.TrackEnContent, EnContent = item.TrackEnContent,
Files = item.Files == null Files = item.Files == null
@ -231,7 +236,7 @@ public class TrackOrderService : ApplicationService
} }
// 按轨迹发生时间正序排序 // 按轨迹发生时间正序排序
res.Data = res.Data?.OrderBy(m => m.TrackTime).ToList(); res.Data = res.Data.OrderBy(m => m.TrackTime).ToList();
if (!order.IsCompleted) //如果没完结则显示签收节点 if (!order.IsCompleted) //如果没完结则显示签收节点
{ {