hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

เพิ่ม REsponse LeaveRange,LeaveRangeEnd ลงใน /user/table
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source 
เพิ่ม fullname ลงไป และ search จากฟีลนั้น
This commit is contained in:
Suphonchai Phoonsawat 2025-04-25 14:48:26 +07:00
parent 04b17729e0
commit d54db7b58f
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
BMA.EHR.Leave/Controllers/LeaveBeginningController.cs
View file

@ -108,10 +108,7 @@ namespace BMA.EHR.Leave.Service.Controllers
if (req.Type != Guid.Empty) if (req.Type != Guid.Empty)
resData = resData.Where(x => x.LeaveTypeId == req.Type).ToList(); resData = resData.Where(x => x.LeaveTypeId == req.Type).ToList();
if (req.Keyword != "") var result = new List<dynamic>();
resData = resData.Where(x => x.FirstName!.Contains(req.Keyword) || x.LastName!.Contains(req.Keyword)).ToList();
var result = new List<object>();
foreach (var item in resData) foreach (var item in resData)
{ {
@ -119,6 +116,7 @@ namespace BMA.EHR.Leave.Service.Controllers
{ {
item.Id, item.Id,
item.ProfileId, item.ProfileId,
FullName = $"{item.Prefix}{item.FirstName} {item.LastName}",
item.Prefix, item.Prefix,
item.FirstName, item.FirstName,
item.LastName, 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(); var pageResult = result.Skip((req.Page - 1) * req.PageSize).Take(req.PageSize).ToList();
return Success(new { data = pageResult, total = result.Count }); return Success(new { data = pageResult, total = result.Count });

2
BMA.EHR.Leave/Controllers/LeaveRequestController.cs
View file

@ -1312,6 +1312,8 @@ namespace BMA.EHR.Leave.Service.Controllers
LeaveStartDate = item.LeaveStartDate, LeaveStartDate = item.LeaveStartDate,
LeaveEndDate = item.LeaveEndDate, LeaveEndDate = item.LeaveEndDate,
HajjDayStatus = item.HajjDayStatus, HajjDayStatus = item.HajjDayStatus,
LeaveRange = item.LeaveRange,
LeaveRangeEnd = item.LeaveRangeEnd,
}; };
result.Add(res); result.Add(res);
} }

4
BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs
View file

@ -22,5 +22,9 @@
public DateTime LeaveStartDate { get; set; } = DateTime.Now; public DateTime LeaveStartDate { get; set; } = DateTime.Now;
public DateTime LeaveEndDate { get; set; } = DateTime.Now; public DateTime LeaveEndDate { get; set; } = DateTime.Now;
public string? LeaveRange { get; set; } = "ALL";
public string? LeaveRangeEnd { get; set; } = "ALL";
} }
} }