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

轨迹模版，轨迹状态查询添加选中的id

Browse Source
This commit is contained in:
moyongzhen 2024-03-01 15:40:33 +08:00
parent 3921f00e4b
commit 205526e370
6 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs
View File

@ -64,6 +64,11 @@
/// <summary>
/// 关键字
/// </summary>
public string Keywords { get; set; } = "";
public string? Keywords { get; set; }
/// <summary>
/// 选中的轨迹状态id
/// </summary>
public List<int>? SelectIds { get; set;}
}
}

9
src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs
View File

@ -15,9 +15,14 @@
/// </summary>
public string Keywords { get; set; } = "";
///// <summary>
///// 轨迹模版id，轨迹映射的查询使用
///// </summary>
//public int TrackTemplateId { get; set; }
/// <summary>
/// 轨迹模版id，轨迹映射的查询使用
/// 选中的轨迹模版id
/// </summary>
public int TrackTemplateId { get; set; }
public List<int>? SelectIds { get; set; }
}
}

7
src/SJZY.Track.Domain/Dtos/TrackStatus/GetPageTrackStatusVO.cs
View File

@ -10,5 +10,10 @@ public class GetPageTrackStatusVO : PageInfoInput
/// <summary>
/// 关键字
/// </summary>
public string Keywords { get; set; }
public string? Keywords { get; set; }
/// <summary>
/// 选中的轨迹状态id
/// </summary>
public List<int>? SelectIds { get; set; }
}

10
src/SJZY.Track.Domain/Dtos/TrackTemplate/GetPageTrackTemplateVO.cs
View File

@ -12,13 +12,7 @@ public class GetPageTrackTemplateVO : PageInfoInput
/// </summary>
public string Keywords { get; set; }
///// <summary>
///// 是否置顶
///// </summary>
//public bool IsTop { get; set; }=false;
/// <summary>
/// 轨迹模版id
/// 选中的轨迹模版id
/// </summary>
public int TrackTemplateId { get; set; }
public List<int>? SelectIds { get; set; }
}

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

@ -45,6 +45,7 @@ public class TrackStatusRepository : BasicRepository<TrackStatusEntity>, 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,

8
src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs
View File

@ -47,9 +47,7 @@ public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, 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<TrackTemplateEntity>, 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;
}