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-02-28 17:19:09 +08:00
parent 1b55ad2965
commit 25bed79bf6
3 changed files with 12 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/SJZY.Track.Application/AutoMapper/TrackTemplateAutoMapperProfile.cs
View File

@ -3,6 +3,7 @@ using AutoMapper.Internal.Mappers;
using SJZY.Track.Application.Dtos.TrackTemplates;
using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
using SJZY.Track.Domain.Dtos.TrackTemplate;
using Volo.Abp.ObjectMapping;
namespace SJZY.Track.Application.AutoMapper;
@ -14,11 +15,10 @@ public class TrackTemplateAutoMapperProfile : Profile
public TrackTemplateAutoMapperProfile()
{
CreateMap<GetTrackTemplateDetailVO, GetTrackTemplateDetailDto>(MemberList.None);
//CreateMap<UnifyResultDto<GetTrackTemplateDetailVO>, UnifyResultDto<GetTrackTemplateDetailDto>>(MemberList.None);
CreateMap<EditTrackTemplateContentInput, TrackTemplateContentEntity>(MemberList.None);
CreateMap<EditTrackTemplateInput, TrackTemplateEntity>(MemberList.None);
CreateMap<GetPageTrackTemplateInput, GetPageTrackTemplateVO>(MemberList.None);
CreateMap<GetTrackTemplateListVO, GetTrackTemplateListDto>(MemberList.None);
CreateMap<UnifyPageResultDto<GetTrackTemplateListVO>, UnifyPageResultDto<GetTrackTemplateListDto>>(MemberList.None);
}
}

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

@ -34,7 +34,6 @@ namespace SJZY.Track.Application.Services.TrackContents
/// </summary>
/// <returns></returns>
[HttpPost("Edit")]
[AllowAnonymous]
public async Task<UnifyResultDto> EditAsync(EditTrackContentInput input)
{
return input.Options switch

50
src/SJZY.Track.Repository/TrackTemplateRepository.cs
View File

@ -30,13 +30,13 @@ public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITr
.Where((a, b) => a.Id == id)
.Select((a, b) => new
GetTrackTemplateDetailVO
{
Id = a.Id,
Code = a.Code,
Name = a.Name,
SubSystemId = a.SubSystemId,
SubSystem = b.CnName
}).FirstAsync();
{
Id = a.Id,
Code = a.Code,
Name = a.Name,
SubSystemId = a.SubSystemId,
SubSystem = b.CnName
}).FirstAsync();
return detail;
}
@ -54,6 +54,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)
.Select((a, b) => new GetTrackTemplateListVO
{
Id = a.Id,
@ -63,41 +64,6 @@ public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITr
SubSystem = b.CnName
})
.ToPagedListAsync(input.PageIndex, input.PageSize);
//如果轨迹模版id传值了，就置顶在第一条
if (input.TrackTemplateId > 0 && (!pagedList.List.IsNullOrEmpty()))
{
if (input.PageIndex == 1)
{
bool existCurrent = pagedList.List.Any(x => x.Id == input.TrackTemplateId);
if (existCurrent)
{
var item = pagedList.List.FirstOrDefault(x => x.Id == input.TrackTemplateId);
pagedList.List.Remove(item);
pagedList.List.Insert(0, item);
}
else
{
var item = await Context.Queryable<TrackTemplateEntity>()
.LeftJoin<VSystemEntity>((a, b) => a.SubSystemId == b.Id)
.Where((a, b) => a.Id == input.TrackTemplateId)
.Select((a, b) => new GetTrackTemplateListVO
{
Id = a.Id,
Code = a.Code,
CreateTime = a.CreateTime,
Name = a.Name,
SubSystem = b.CnName
})
.FirstAsync();
if (item != null)
{
var removeItem = pagedList.List.LastOrDefault();
pagedList.List.Remove(removeItem);
pagedList.List.Insert(0, item);
}
}
}
}
return pagedList;
}