Added pagination in get service project list API
This commit is contained in:
parent
2b6c886186
commit
394b8496f9
@ -49,6 +49,7 @@ namespace Marco.Pms.Services.Controllers
|
|||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet("list")]
|
[HttpGet("list")]
|
||||||
public async Task<IActionResult> GetServiceProjectList([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 20)
|
public async Task<IActionResult> GetServiceProjectList([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 20)
|
||||||
{
|
{
|
||||||
@ -64,8 +65,6 @@ namespace Marco.Pms.Services.Controllers
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
[HttpPut("edit/{id}")]
|
[HttpPut("edit/{id}")]
|
||||||
public async Task<IActionResult> UpdateProject(Guid id, [FromBody] ServiceProjectDto serviceProject)
|
public async Task<IActionResult> UpdateProject(Guid id, [FromBody] ServiceProjectDto serviceProject)
|
||||||
{
|
{
|
||||||
@ -85,11 +84,5 @@ namespace Marco.Pms.Services.Controllers
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -139,7 +139,9 @@ namespace Marco.Pms.Services.Service
|
|||||||
var serviceProjectIds = serviceProjects.Select(sp => sp.Id).ToList();
|
var serviceProjectIds = serviceProjects.Select(sp => sp.Id).ToList();
|
||||||
var serviceProjectServiceMappings = await _context.ServiceProjectServiceMapping
|
var serviceProjectServiceMappings = await _context.ServiceProjectServiceMapping
|
||||||
.Include(sps => sps.Service)
|
.Include(sps => sps.Service)
|
||||||
.Where(sps => serviceProjectIds.Contains(sps.Id) && sps.Service != null && sps.TenantId == tenantId)
|
.Where(sps => serviceProjectIds.Contains(sps.ProjectId) &&
|
||||||
|
sps.Service != null &&
|
||||||
|
sps.TenantId == tenantId)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
var serviceProjectVMs = serviceProjects.Select(sp =>
|
var serviceProjectVMs = serviceProjects.Select(sp =>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user