fix: 节点表添加子系统名称
This commit is contained in:
parent
9494ca2cb7
commit
3df894d20b
@ -54,6 +54,18 @@ namespace SJZY.Track.Application.Services.TrackNodeServices
|
|||||||
var resultDto = await _trackNodeRepository.GetPageList(queryParam);
|
var resultDto = await _trackNodeRepository.GetPageList(queryParam);
|
||||||
return resultDto;
|
return resultDto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取详情
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="nodeid">节点id</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost("GetDetail")]
|
||||||
|
public async Task<UnifyResultDto> GetDetail(int nodeid)
|
||||||
|
{
|
||||||
|
var resultDto = await _trackNodeRepository.GetDetail(nodeid);
|
||||||
|
return new UnifyResultDto(true,resultDto);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取分页轨迹字典,下拉框用的
|
/// 获取分页轨迹字典,下拉框用的
|
||||||
@ -24,4 +24,11 @@ public interface ITrackNodeRepository:IBasicRepository<TrackNodeEntity>
|
|||||||
/// <param name="inputId"></param>
|
/// <param name="inputId"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
Task<int> DeleteById(long inputId);
|
Task<int> DeleteById(long inputId);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取详情
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="id"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<TrackNodeDto> GetDetail(long id);
|
||||||
}
|
}
|
||||||
@ -14,6 +14,11 @@ public class TrackNodeDto
|
|||||||
/// 子系统id
|
/// 子系统id
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int SubSystemId { get; set; }
|
public int SubSystemId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 系统名称
|
||||||
|
/// </summary>
|
||||||
|
public string? SystemName { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 节点名称
|
/// 节点名称
|
||||||
|
|||||||
@ -11,10 +11,11 @@ public class TrackNodeRepository: BasicRepository<TrackNodeEntity>,ITrackNodeRep
|
|||||||
var result = await Context.Queryable<TrackNodeEntity>()
|
var result = await Context.Queryable<TrackNodeEntity>()
|
||||||
.LeftJoin<VUserEntity>((t,u1)=>t.CreateUserId==u1.Id)
|
.LeftJoin<VUserEntity>((t,u1)=>t.CreateUserId==u1.Id)
|
||||||
.LeftJoin<VUserEntity>((t,u1,u2)=>t.UpdateUserId==u2.Id)
|
.LeftJoin<VUserEntity>((t,u1,u2)=>t.UpdateUserId==u2.Id)
|
||||||
|
.LeftJoin<VSystemEntity>((t,u1,u2,u3)=>t.SubSystemId==u3.Id)
|
||||||
.Where((t,u1,u2)=>!t.IsDeleted&&!u1.IsDeleted&&!u2.IsDeleted)
|
.Where((t,u1,u2)=>!t.IsDeleted&&!u1.IsDeleted&&!u2.IsDeleted)
|
||||||
.WhereIF(!string.IsNullOrEmpty(queryParam.KeyWord), (t,u1,u2)=>t.NodeName!.Contains(queryParam.KeyWord)||t.NodeEnName!.Contains(queryParam.KeyWord))
|
.WhereIF(!string.IsNullOrEmpty(queryParam.KeyWord), (t,u1,u2)=>t.NodeName!.Contains(queryParam.KeyWord)||t.NodeEnName!.Contains(queryParam.KeyWord))
|
||||||
.WhereIF(queryParam.SystemId.HasValue,(t,u1,u2)=>t.SubSystemId == queryParam.SystemId.Value)
|
.WhereIF(queryParam.SystemId.HasValue,(t,u1,u2)=>t.SubSystemId == queryParam.SystemId.Value)
|
||||||
.Select((t, u1, u2) =>new TrackNodeDto()
|
.Select((t, u1, u2,u3) =>new TrackNodeDto()
|
||||||
{
|
{
|
||||||
Id = t.Id,
|
Id = t.Id,
|
||||||
NodeName = t.NodeName,
|
NodeName = t.NodeName,
|
||||||
@ -24,7 +25,8 @@ public class TrackNodeRepository: BasicRepository<TrackNodeEntity>,ITrackNodeRep
|
|||||||
CreateTime = t.CreateTime,
|
CreateTime = t.CreateTime,
|
||||||
UpdateUserId = t.UpdateUserId,
|
UpdateUserId = t.UpdateUserId,
|
||||||
UpdateUserName = u2.Name,
|
UpdateUserName = u2.Name,
|
||||||
CreateUserName = u1.Name
|
CreateUserName = u1.Name,
|
||||||
|
SystemName = u3.CnName
|
||||||
}).ToPagedListAsync(queryParam.PageIndex, queryParam.PageSize);
|
}).ToPagedListAsync(queryParam.PageIndex, queryParam.PageSize);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
@ -50,4 +52,27 @@ public class TrackNodeRepository: BasicRepository<TrackNodeEntity>,ITrackNodeRep
|
|||||||
{
|
{
|
||||||
return Context.Deleteable<TrackNodeEntity>().Where(val=>val.Id==inputId).ExecuteCommandAsync();
|
return Context.Deleteable<TrackNodeEntity>().Where(val=>val.Id==inputId).ExecuteCommandAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<TrackNodeDto> GetDetail(long id)
|
||||||
|
{
|
||||||
|
var result = await Context.Queryable<TrackNodeEntity>()
|
||||||
|
.LeftJoin<VUserEntity>((t, u1) => t.CreateUserId == u1.Id)
|
||||||
|
.LeftJoin<VUserEntity>((t, u1, u2) => t.UpdateUserId == u2.Id)
|
||||||
|
.LeftJoin<VSystemEntity>((t, u1, u2, u3) => t.SubSystemId == u3.Id)
|
||||||
|
.Where((t, u1, u2) => !t.IsDeleted && !u1.IsDeleted && !u2.IsDeleted)
|
||||||
|
.Select((t, u1, u2, u3) => new TrackNodeDto()
|
||||||
|
{
|
||||||
|
Id = t.Id,
|
||||||
|
NodeName = t.NodeName,
|
||||||
|
NodeEnName = t.NodeEnName,
|
||||||
|
SubSystemId = t.SubSystemId,
|
||||||
|
UpdateTime = t.UpdateTime,
|
||||||
|
CreateTime = t.CreateTime,
|
||||||
|
UpdateUserId = t.UpdateUserId,
|
||||||
|
UpdateUserName = u2.Name,
|
||||||
|
CreateUserName = u1.Name,
|
||||||
|
SystemName = u3.CnName
|
||||||
|
}).FirstAsync();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user