From 35bb8e13e0fa16dffe04839b0c63c1cd3770f348 Mon Sep 17 00:00:00 2001 From: moyongzhen <2534173414@qq.com> Date: Fri, 15 Mar 2024 15:33:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E8=AE=A2=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=A5=E5=85=85s01=E9=81=97=E6=BC=8F=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/TrackOrders/TrackOrderService.cs | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index 06800fc0..e799aeea 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -42,30 +42,25 @@ public class TrackOrderService : ApplicationService var list = ObjectMapper.Map, List>(trackDetails); var trackCodes = list.Where(a => !a.Code.IsNullOrWhiteSpace()).Select(a => a.Code).Distinct().ToList(); - var trackContents = await _trackContentRepository.GetTrackContentAttributeValue( - new GetTemplateContentAttributeValueInputVO - { - SubSystemId = input.SubSystemId, - TrackTemplateIds = input.TrackTemplateIds, - TrackCodes = trackCodes - }); + var trackContents = await _trackContentRepository.GetTrackContentAttributeValue(new GetTemplateContentAttributeValueInputVO + { + SubSystemId = input.SubSystemId, + TrackTemplateIds = input.TrackTemplateIds, + TrackCodes = trackCodes + }); input.TrackTemplateIds = input.TrackTemplateIds.Where(a => a > 0).ToList(); int id = 1; list.ForEach(a => { a.Id = id++; - var trackContentsOfTemplates = trackContents.Where(b => b.SubSystemId == input.SubSystemId && - b.TrackCode == a.Code - && input.TrackTemplateIds.Contains( - b.TrackTemplateId)); + var trackContentsOfTemplates = trackContents.Where(b => b.SubSystemId == input.SubSystemId && b.TrackCode == a.Code + && input.TrackTemplateIds.Contains(b.TrackTemplateId)); GetTemplateContentAttributeValueVO trackContent = null; - var insertData = input.TrackTemplateIds - .Intersect(trackContentsOfTemplates.Select(aa => aa.TrackTemplateId)).ToList(); + var insertData = input.TrackTemplateIds.Intersect(trackContentsOfTemplates.Select(aa => aa.TrackTemplateId)).ToList(); if (!insertData.IsNullOrEmpty()) { - trackContent = - trackContentsOfTemplates.FirstOrDefault(a => a.TrackTemplateId == insertData.FirstOrDefault()); + trackContent = trackContentsOfTemplates.FirstOrDefault(a => a.TrackTemplateId == insertData.FirstOrDefault()); } if (trackContent != null) @@ -73,7 +68,11 @@ public class TrackOrderService : ApplicationService a.IsCanDelete = trackContent.IsCanDelete; a.IsExternal = trackContent.IsExternal; } - + //else + //{ + // a.IsCanDelete=false; + // a.IsExternal=false; + //} if (a.TrackTimeZoneValue == 0f) { a.TrackTimeZone = $"GTM{" "}+00:00"; @@ -90,6 +89,7 @@ public class TrackOrderService : ApplicationService } }); return list; + } return new List();