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:
hardstylewyl 2025-01-22 16:15:02 +08:00
commit 875ba540e0
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetTrackOutput.cs
View File

@ -19,6 +19,7 @@ public class TrackDetail
public string Code { get; set; } = null!; public string Code { get; set; } = null!;
public string Status { get; set; } = null!; public string Status { get; set; } = null!;
public string? Content { get; set; } public string? Content { get; set; }
public string? EnContent { get; set; }
public string? OriginContent { get; set; } public string? OriginContent { get; set; }
public string Location { get; set; } = null!; public string Location { get; set; } = null!;

10
src/SJZY.Track.Application/Services/ProvideServices/TrackService.Query.cs
View File

@ -56,7 +56,9 @@ public partial class TrackService
foreach (var group in details.GroupBy(x => x.OrderId)) foreach (var group in details.GroupBy(x => x.OrderId))
{ {
var item = new GetTrackOutput(); var item = new GetTrackOutput();
var trackDetails = group.ToList(); var trackDetails = group
.WhereIf(isFilterExternal, x => trackContentDic.TryGetValue(x.TrackCode, out var isExternal) && isExternal)
.ToList();
item.OrderNo = trackDetails.First().OrderNo; item.OrderNo = trackDetails.First().OrderNo;
item.TrackDetails = trackDetails.Select(x => new TrackDetail item.TrackDetails = trackDetails.Select(x => new TrackDetail
@ -65,6 +67,7 @@ public partial class TrackService
Code = x.TrackCode, Code = x.TrackCode,
Status = x.TrackStatus, Status = x.TrackStatus,
Content = x.TrackContent, Content = x.TrackContent,
EnContent = x.TrackEnContent,
OriginContent = x.OriginTrackContent, OriginContent = x.OriginTrackContent,
Location = x.TrackPlace, Location = x.TrackPlace,
Time = Math.Abs(x.TrackTimeZone - GlobalConst.NoneTrackTimeZone) < 1 Time = Math.Abs(x.TrackTimeZone - GlobalConst.NoneTrackTimeZone) < 1
@ -142,7 +145,9 @@ public partial class TrackService
foreach (var group in details.GroupBy(x => x.OrderId)) foreach (var group in details.GroupBy(x => x.OrderId))
{ {
var item = new GetTrackOutput(); var item = new GetTrackOutput();
var trackDetails = group.ToList(); var trackDetails = group
.WhereIf(isFilterExternal, x => trackContentDic.TryGetValue(x.TrackCode, out var isExternal) && isExternal)
.ToList();
item.OrderNo = trackDetails.First().OrderNo; item.OrderNo = trackDetails.First().OrderNo;
item.TrackDetails = trackDetails.Select(x => new TrackDetail item.TrackDetails = trackDetails.Select(x => new TrackDetail
@ -151,6 +156,7 @@ public partial class TrackService
Code = x.TrackCode, Code = x.TrackCode,
Status = x.TrackStatus, Status = x.TrackStatus,
Content = x.TrackContent, Content = x.TrackContent,
EnContent = x.TrackEnContent,
OriginContent = x.OriginTrackContent, OriginContent = x.OriginTrackContent,
Location = x.TrackPlace, Location = x.TrackPlace,
Time = x.TrackTime, Time = x.TrackTime,