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

Merge branch 'S02-轨迹中台' of http://192.168.80.50:3000/Dotnet/SJZY.Track.Api into S02-轨迹中台

Browse Source
This commit is contained in:
柳文翔 2024-03-15 16:09:28 +08:00
commit eb1a3480f0
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,30 +42,25 @@ public class TrackOrderService : ApplicationService
var list = ObjectMapper.Map<List<TrackDetailsIndex>, List<TrackOrderDetailDto>>(trackDetails); var list = ObjectMapper.Map<List<TrackDetailsIndex>, List<TrackOrderDetailDto>>(trackDetails);
var trackCodes = list.Where(a => !a.Code.IsNullOrWhiteSpace()).Select(a => a.Code).Distinct().ToList(); var trackCodes = list.Where(a => !a.Code.IsNullOrWhiteSpace()).Select(a => a.Code).Distinct().ToList();
var trackContents = await _trackContentRepository.GetTrackContentAttributeValue( var trackContents = await _trackContentRepository.GetTrackContentAttributeValue(new GetTemplateContentAttributeValueInputVO
new GetTemplateContentAttributeValueInputVO {
{ SubSystemId = input.SubSystemId,
SubSystemId = input.SubSystemId, TrackTemplateIds = input.TrackTemplateIds,
TrackTemplateIds = input.TrackTemplateIds, TrackCodes = trackCodes
TrackCodes = trackCodes });
});
input.TrackTemplateIds = input.TrackTemplateIds.Where(a => a > 0).ToList(); input.TrackTemplateIds = input.TrackTemplateIds.Where(a => a > 0).ToList();
int id = 1; int id = 1;
list.ForEach(a => list.ForEach(a =>
{ {
a.Id = id++; a.Id = id++;
var trackContentsOfTemplates = trackContents.Where(b => b.SubSystemId == input.SubSystemId && var trackContentsOfTemplates = trackContents.Where(b => b.SubSystemId == input.SubSystemId && b.TrackCode == a.Code
b.TrackCode == a.Code && input.TrackTemplateIds.Contains(b.TrackTemplateId));
&& input.TrackTemplateIds.Contains(
b.TrackTemplateId));
GetTemplateContentAttributeValueVO trackContent = null; GetTemplateContentAttributeValueVO trackContent = null;
var insertData = input.TrackTemplateIds var insertData = input.TrackTemplateIds.Intersect(trackContentsOfTemplates.Select(aa => aa.TrackTemplateId)).ToList();
.Intersect(trackContentsOfTemplates.Select(aa => aa.TrackTemplateId)).ToList();
if (!insertData.IsNullOrEmpty()) if (!insertData.IsNullOrEmpty())
{ {
trackContent = trackContent = trackContentsOfTemplates.FirstOrDefault(a => a.TrackTemplateId == insertData.FirstOrDefault());
trackContentsOfTemplates.FirstOrDefault(a => a.TrackTemplateId == insertData.FirstOrDefault());
} }
if (trackContent != null) if (trackContent != null)
@ -73,7 +68,11 @@ public class TrackOrderService : ApplicationService
a.IsCanDelete = trackContent.IsCanDelete; a.IsCanDelete = trackContent.IsCanDelete;
a.IsExternal = trackContent.IsExternal; a.IsExternal = trackContent.IsExternal;
} }
//else
//{
// a.IsCanDelete=false;
// a.IsExternal=false;
//}
if (a.TrackTimeZoneValue == 0f) if (a.TrackTimeZoneValue == 0f)
{ {
a.TrackTimeZone = $"GTM{" "}+00:00"; a.TrackTimeZone = $"GTM{" "}+00:00";
@ -90,6 +89,7 @@ public class TrackOrderService : ApplicationService
} }
}); });
return list; return list;
} }
return new List<TrackOrderDetailDto>(); return new List<TrackOrderDetailDto>();