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

轨迹明细是否删除和对外的调整

Browse Source
This commit is contained in:
moyongzhen 2024-03-06 19:48:43 +08:00
parent 7836a78be6
commit 62c43ab146
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ namespace SJZY.Track.Application.Services.TrackOrders
TrackTemplateIds = input.TrackTemplateIds, TrackTemplateIds = input.TrackTemplateIds,
TrackCodes=trackCodes TrackCodes=trackCodes
}); });
input.TrackTemplateIds =input.TrackTemplateIds.Where(a => a>0).ToList();
int id = 1; int id = 1;
list.ForEach(a => list.ForEach(a =>
{ {
@ -61,7 +61,13 @@ namespace SJZY.Track.Application.Services.TrackOrders
var trackContentsOfTemplates = trackContents.Where(b => b.SubSystemId==input.SubSystemId && b.TrackCode==a.Code var trackContentsOfTemplates = trackContents.Where(b => b.SubSystemId==input.SubSystemId && b.TrackCode==a.Code
&& input.TrackTemplateIds.Contains(b.TrackTemplateId)); && input.TrackTemplateIds.Contains(b.TrackTemplateId));
var trackContent = trackContentsOfTemplates.FirstOrDefault(); GetTemplateContentAttributeValueVO trackContent = null;
var insertData = input.TrackTemplateIds.Intersect(trackContentsOfTemplates.Select(aa => aa.TrackTemplateId)).ToList();
if (!insertData.IsNullOrEmpty())
{
trackContent =trackContentsOfTemplates.FirstOrDefault(a => a.TrackTemplateId==insertData.FirstOrDefault());
}
if (trackContent!=null) if (trackContent!=null)
{ {
a.IsCanDelete=trackContent.IsCanDelete; a.IsCanDelete=trackContent.IsCanDelete;

1
src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs
View File

@ -103,6 +103,7 @@ public class TrackContentRepository : BasicRepository<TrackContentEntity>, ITrac
.WhereIF(input.SubSystemId>0, (a, b, c) => a.SubSystemId==input.SubSystemId) .WhereIF(input.SubSystemId>0, (a, b, c) => a.SubSystemId==input.SubSystemId)
.WhereIF(!input.TrackTemplateIds.IsNullOrEmpty(), (a, b, c) => input.TrackTemplateIds.Contains(c.Id)) .WhereIF(!input.TrackTemplateIds.IsNullOrEmpty(), (a, b, c) => input.TrackTemplateIds.Contains(c.Id))
.Where((a, b, c) => c.Id>0) .Where((a, b, c) => c.Id>0)
//.OrderByIF(!input.TrackTemplateIds.IsNullOrEmpty(), (a, b, c) => SqlFunc.IIF(input.TrackTemplateIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), c.CreateTime), OrderByType.Desc)
.Select((a, b, c) => new GetTemplateContentAttributeValueVO .Select((a, b, c) => new GetTemplateContentAttributeValueVO
{ {
IsCanDelete=b.IsCanDelete, IsCanDelete=b.IsCanDelete,