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

Merge branch 'S01-轨迹中台' into dev

Browse Source
This commit is contained in:
moyongzhen 2024-03-02 11:35:17 +08:00
commit a47465758f
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs
View File

@ -12,6 +12,11 @@
/// </summary>
public string? Keywords { get; set; }
/// <summary>
/// 轨迹状态id
/// </summary>
public int TrackStatusId { get; set; }
/// <summary>
/// 选中的轨迹内容id
/// </summary>

1
src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs
View File

@ -158,7 +158,6 @@ namespace SJZY.Track.Application.Services.TrackContents
private async Task<UnifyResultDto> DeleteAsync(EditTrackContentInput input)
{
#region 业务校验
//需要加个判断，存在内容映射，则出提示
#endregion 业务校验

5
src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs
View File

@ -18,6 +18,11 @@ namespace SJZY.Track.Domain.Dtos.TrackContents
/// </summary>
public string? Keywords { get; set; }
/// <summary>
/// 轨迹状态id
/// </summary>
public int TrackStatusId { get; set; }
/// <summary>
/// 选中的轨迹内容id
/// </summary>

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

@ -60,8 +60,8 @@ public class TrackContentRepository : BasicRepository<TrackContentEntity>, ITrac
.WhereIF(input.SubSystemId > 0, (a, b, c, d, e, f) => a.SubSystemId == input.SubSystemId)
.WhereIF(!input.Keywords.IsNullOrWhiteSpace(),
(a, b, c, d, e, f) => a.Code.Contains(input.Keywords) || a.Content.Contains(input.Keywords)
|| a.EnContent.Contains(input.Keywords)
)
|| a.EnContent.Contains(input.Keywords))
.WhereIF(input.TrackStatusId>0, (a, b, c, d, e, f) => a.TrackStatusId==input.TrackStatusId)
.OrderByIF(input.SelectIds.IsNullOrEmpty(), (a, b, c, d, e, f) => a.CreateTime, OrderByType.Desc)
.OrderByIF(!input.SelectIds.IsNullOrEmpty(), (a, b, c, d, e, f) => SqlFunc.IIF(input.SelectIds.Contains(a.Id), SqlFunc.DateAdd(SqlFunc.GetDate(), 1), a.CreateTime), OrderByType.Desc)
.Select((a, b, c, d, e, f) => new GetTrackContentListVO