diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs
index 8cadc1ea..c505aa72 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs
@@ -64,6 +64,11 @@
///
/// 关键字
///
- public string Keywords { get; set; } = "";
+ public string? Keywords { get; set; }
+
+ ///
+ /// 选中的轨迹状态id
+ ///
+ public List? SelectIds { get; set;}
}
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs
index ba54db15..e4e901df 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs
@@ -15,9 +15,14 @@
///
public string Keywords { get; set; } = "";
+ /////
+ ///// 轨迹模版id,轨迹映射的查询使用
+ /////
+ //public int TrackTemplateId { get; set; }
+
///
- /// 轨迹模版id,轨迹映射的查询使用
+ /// 选中的轨迹模版id
///
- public int TrackTemplateId { get; set; }
+ public List? SelectIds { get; set; }
}
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs
index 6c5d3b46..f19fb8c5 100644
--- a/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs
@@ -10,5 +10,10 @@ public class GetPageTrackStatusVO : PageInfoInput
///
/// 关键字
///
- public string Keywords { get; set; }
+ public string? Keywords { get; set; }
+
+ ///
+ /// 选中的轨迹状态id
+ ///
+ public List? SelectIds { get; set; }
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs
index e4fa7963..99005db7 100644
--- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs
@@ -12,13 +12,7 @@ public class GetPageTrackTemplateVO : PageInfoInput
///
public string Keywords { get; set; }
- /////
- ///// 是否置顶
- /////
- //public bool IsTop { get; set; }=false;
-
- ///
- /// 轨迹模版id
+ /// 选中的轨迹模版id
///
- public int TrackTemplateId { get; set; }
+ public List? SelectIds { get; set; }
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs
index 703eb8c4..831e80e5 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs
@@ -45,6 +45,7 @@ public class TrackStatusRepository : BasicRepository, ITrackS
.WhereIF(!input.Keywords.IsNullOrWhiteSpace(),
(a, b, c, d) => a.Status.Contains(input.Keywords) || a.EnStatus.Contains(input.Keywords) ||
a.Code.Contains(input.Keywords))
+ .OrderByIF(!input.SelectIds.IsNullOrEmpty(), (a, b) => SqlFunc.IIF(input.SelectIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc)
.Select((a, b, c, d) => new GetTrackStatusListVO
{
Id = a.Id,
diff --git a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs
index 04cd6e0e..6e254c16 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs
@@ -47,9 +47,7 @@ public class TrackTemplateRepository : BasicRepository, ITr
.WhereIF(input.SubSystemId > 0, (a, b) => a.SubSystemId == input.SubSystemId)
.WhereIF(!input.Keywords.IsNullOrWhiteSpace(),
(a, b) => a.Name.Contains(input.Keywords) || a.Code.Contains(input.Keywords))
- .OrderByIF(input.TrackTemplateId > 0,
- (a, b) => SqlFunc.IIF(a.Id == input.TrackTemplateId, SqlFunc.DateAdd(SqlFunc.GetDate(), 1),
- a.CreateTime), OrderByType.Desc)
+ .OrderByIF(!input.SelectIds.IsNullOrEmpty(),(a,b)=> SqlFunc.IIF(input.SelectIds.Contains(a.Id),SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc)
.Select((a, b) => new GetTrackTemplateListVO
{
Id = a.Id,
@@ -59,7 +57,9 @@ public class TrackTemplateRepository : BasicRepository, ITr
SubSystem = b.CnName
})
.ToPagedListAsync(input.PageIndex, input.PageSize);
-
+ //.OrderByIF(input.TrackTemplateId > 0,
+ // (a, b) => SqlFunc.IIF(a.Id == input.TrackTemplateId, SqlFunc.DateAdd(SqlFunc.GetDate(), 1),
+ //a.CreateTime), OrderByType.Desc)
return pagedList;
}