เพิ่ม REsponse LeaveRange,LeaveRangeEnd ลงใน /user/table
Some checks failed
release-dev / release-dev (push) Failing after 12s
Some checks failed
release-dev / release-dev (push) Failing after 12s
เพิ่ม fullname ลงไป และ search จากฟีลนั้น
This commit is contained in:
parent
04b17729e0
commit
d54db7b58f
3 changed files with 11 additions and 4 deletions
|
|
@ -108,10 +108,7 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
if (req.Type != Guid.Empty)
|
||||
resData = resData.Where(x => x.LeaveTypeId == req.Type).ToList();
|
||||
|
||||
if (req.Keyword != "")
|
||||
resData = resData.Where(x => x.FirstName!.Contains(req.Keyword) || x.LastName!.Contains(req.Keyword)).ToList();
|
||||
|
||||
var result = new List<object>();
|
||||
var result = new List<dynamic>();
|
||||
|
||||
foreach (var item in resData)
|
||||
{
|
||||
|
|
@ -119,6 +116,7 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
{
|
||||
item.Id,
|
||||
item.ProfileId,
|
||||
FullName = $"{item.Prefix}{item.FirstName} {item.LastName}",
|
||||
item.Prefix,
|
||||
item.FirstName,
|
||||
item.LastName,
|
||||
|
|
@ -135,6 +133,9 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
});
|
||||
}
|
||||
|
||||
if (req.Keyword != "")
|
||||
result = result.Where(x => x.FullName!.Contains(req.Keyword)).ToList();
|
||||
|
||||
var pageResult = result.Skip((req.Page - 1) * req.PageSize).Take(req.PageSize).ToList();
|
||||
|
||||
return Success(new { data = pageResult, total = result.Count });
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue