เอา paging ออก
This commit is contained in:
parent
e8cf09b7ac
commit
99a3cfd052
8 changed files with 163 additions and 155 deletions
|
|
@ -92,7 +92,8 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
}
|
||||
|
||||
[HttpGet("exam/{year}")]
|
||||
public async Task<ActionResult<ResponseObject>> GetExam(int year, int page = 1, int pageSize = 10, string keyword = "")
|
||||
public async Task<ActionResult<ResponseObject>> GetExam(int year)
|
||||
// public async Task<ActionResult<ResponseObject>> GetExam(int year, int page = 1, int pageSize = 10, string keyword = "")
|
||||
{
|
||||
var data = await _context.Placements.Where(x => year > 0 ? (x.Year == year) : (x.Year > 0))
|
||||
.OrderByDescending(x => x.CreatedAt)
|
||||
|
|
@ -111,20 +112,20 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
IsExpired = x.EndDate.Date < DateTime.Now.Date,
|
||||
CreatedAt = x.CreatedAt,
|
||||
}).ToListAsync();
|
||||
if (keyword != "")
|
||||
{
|
||||
var data_ = data.Where(x =>
|
||||
(x.ExamRound != null && x.ExamRound.Contains(keyword)) ||
|
||||
(x.ExamOrder != null && x.ExamOrder.Contains(keyword)) ||
|
||||
(x.NumberOfCandidates != null && x.NumberOfCandidates.ToString().Contains(keyword)))
|
||||
.OrderByDescending(x => x.CreatedAt)
|
||||
.Skip((page - 1) * pageSize)
|
||||
.Take(pageSize)
|
||||
.ToList();
|
||||
// if (keyword != "")
|
||||
// {
|
||||
// var data_ = data.Where(x =>
|
||||
// (x.ExamRound != null && x.ExamRound.Contains(keyword)) ||
|
||||
// (x.ExamOrder != null && x.ExamOrder.Contains(keyword)) ||
|
||||
// (x.NumberOfCandidates != null && x.NumberOfCandidates.ToString().Contains(keyword)))
|
||||
// .OrderByDescending(x => x.CreatedAt)
|
||||
// .Skip((page - 1) * pageSize)
|
||||
// .Take(pageSize)
|
||||
// .ToList();
|
||||
|
||||
data = data_;
|
||||
}
|
||||
return Success( new { data, total = data.Count });
|
||||
// data = data_;
|
||||
// }
|
||||
return Success(data);
|
||||
}
|
||||
|
||||
[HttpGet("pass/{examId:length(36)}")]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue