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

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

Browse Source
This commit is contained in:
moyongzhen 2024-03-02 11:03:40 +08:00
commit 2f837a061b
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SJZY.Track.Api/appsettings.json
View File

@ -1,6 +1,6 @@
{ {
"Configuration": { "Configuration": {
"UseLocalConfiguration": true, //是否使用本地配置文件 "UseLocalConfiguration": false, //是否使用本地配置文件
"ConfiguraFileName": "appsettings.Development.json", //指定配置文件名称，开启UseLocalConfiguration时生效 "ConfiguraFileName": "appsettings.Development.json", //指定配置文件名称，开启UseLocalConfiguration时生效
"Apollo": { "Apollo": {
"AppId": "SJZY.Track.Configuration", "AppId": "SJZY.Track.Configuration",

2
src/SJZY.Track.Domain/Dtos/Common/KeywordsInputVO.cs
View File

@ -15,5 +15,5 @@ public class KeywordsInputVO : PageInfoInput
/// <summary> /// <summary>
/// 选中项 /// 选中项
/// </summary> /// </summary>
public List<int>? SelectedId { get; set; } public List<int>? SelectedIds { get; set; }
} }

5
src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentDetailOutputVO.cs
View File

@ -38,4 +38,9 @@ public class GetTrackTemplateContentDetailOutputVO
/// 轨迹状态id /// 轨迹状态id
/// </summary> /// </summary>
public int TrackStatusId { get; set; } public int TrackStatusId { get; set; }
/// <summary>
/// 轨迹模板id
/// </summary>
public int TrackTemplateId { get; set; }
} }

5
src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateContentPageInputVO.cs
View File

@ -6,4 +6,9 @@ public class GetTrackTemplateContentPageInputVO : PageInfoInput
/// 轨迹模板id /// 轨迹模板id
/// </summary> /// </summary>
public List<int> TrackTemplateIds { get; set; } public List<int> TrackTemplateIds { get; set; }
/// <summary>
/// 选中项
/// </summary>
public List<int>? SelectedIds { get; set; }
} }

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

@ -85,7 +85,8 @@ public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITr
templateContent.UpdateUserId == updateUser.Id && !updateUser.IsDeleted) templateContent.UpdateUserId == updateUser.Id && !updateUser.IsDeleted)
.Filter(null, true) .Filter(null, true)
.Where(templateContent => input.TrackTemplateIds.Contains(templateContent.TrackTemplateId) && !templateContent.IsDeleted) .Where(templateContent => input.TrackTemplateIds.Contains(templateContent.TrackTemplateId) && !templateContent.IsDeleted)
.OrderByDescending(templateContent => templateContent.CreateTime) .OrderByIF(input.SelectedIds.IsNullOrEmpty(), templateContent => templateContent.CreateTime, OrderByType.Desc)
.OrderByIF(!input.SelectedIds.IsNullOrEmpty(), templateContent => SqlFunc.IIF(input.SelectedIds.Contains(templateContent.TrackContentId), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), templateContent.CreateTime), OrderByType.Desc)
.Select((templateContent, trackContent, trackStatus, enumValue, trackFlag, createUser, updateUser) => .Select((templateContent, trackContent, trackStatus, enumValue, trackFlag, createUser, updateUser) =>
new GetTrackTemplateContentPageOutputVO new GetTrackTemplateContentPageOutputVO
{ {