เอา paging ออก

This commit is contained in:
kittapath 2024-09-17 15:48:12 +07:00
parent e8cf09b7ac
commit 99a3cfd052
8 changed files with 163 additions and 155 deletions

View file

@ -142,7 +142,8 @@ namespace BMA.EHR.Placement.Service.Controllers
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet()]
public async Task<ActionResult<ResponseObject>> GetListByAdmin(int page = 1, int pageSize = 10, string keyword = "")
public async Task<ActionResult<ResponseObject>> GetListByAdmin()
// public async Task<ActionResult<ResponseObject>> GetListByAdmin(int page = 1, int pageSize = 10, string keyword = "")
{
var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_TRANSFER_REQ");
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
@ -219,23 +220,23 @@ namespace BMA.EHR.Placement.Service.Controllers
})
.ToListAsync();
if (keyword != "")
{
var data = placementTransfers.Where(x =>
(x.prefix != null && x.prefix.Contains(keyword)) ||
(x.firstName != null && x.firstName.Contains(keyword)) ||
(x.lastName != null && x.lastName.Contains(keyword)) ||
(x.posTypeNameOld != null && x.posTypeNameOld.Contains(keyword)) ||
(x.posLevelNameOld != null && x.posLevelNameOld.Contains(keyword)))
.OrderByDescending(x => x.CreatedAt)
.Skip((page - 1) * pageSize)
.Take(pageSize)
.ToList();
// if (keyword != "")
// {
// var data = placementTransfers.Where(x =>
// (x.prefix != null && x.prefix.Contains(keyword)) ||
// (x.firstName != null && x.firstName.Contains(keyword)) ||
// (x.lastName != null && x.lastName.Contains(keyword)) ||
// (x.posTypeNameOld != null && x.posTypeNameOld.Contains(keyword)) ||
// (x.posLevelNameOld != null && x.posLevelNameOld.Contains(keyword)))
// .OrderByDescending(x => x.CreatedAt)
// .Skip((page - 1) * pageSize)
// .Take(pageSize)
// .ToList();
placementTransfers = data;
}
// placementTransfers = data;
// }
return Success(new { data = placementTransfers, total = placementTransfers.Count });
return Success(placementTransfers);
}
}