From d54db7b58f84c2321ad0140bd359be0e0dc1ca6c Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Fri, 25 Apr 2025 14:48:26 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=20REsponse=20LeaveRange,LeaveRangeEnd=20=E0=B8=A5=E0=B8=87?= =?UTF-8?q?=E0=B9=83=E0=B8=99=20/user/table=20=E0=B9=80=E0=B8=9E=E0=B8=B4?= =?UTF-8?q?=E0=B9=88=E0=B8=A1=20fullname=20=E0=B8=A5=E0=B8=87=E0=B9=84?= =?UTF-8?q?=E0=B8=9B=20=E0=B9=81=E0=B8=A5=E0=B8=B0=20search=20=E0=B8=88?= =?UTF-8?q?=E0=B8=B2=E0=B8=81=E0=B8=9F=E0=B8=B5=E0=B8=A5=E0=B8=99=E0=B8=B1?= =?UTF-8?q?=E0=B9=89=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Leave/Controllers/LeaveBeginningController.cs | 9 +++++---- BMA.EHR.Leave/Controllers/LeaveRequestController.cs | 2 ++ .../DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs | 4 ++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs b/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs index ff714ccd..3771aa93 100644 --- a/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs @@ -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(); + var result = new List(); 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 }); diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index f04e4fa8..c607be5f 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -1312,6 +1312,8 @@ namespace BMA.EHR.Leave.Service.Controllers LeaveStartDate = item.LeaveStartDate, LeaveEndDate = item.LeaveEndDate, HajjDayStatus = item.HajjDayStatus, + LeaveRange = item.LeaveRange, + LeaveRangeEnd = item.LeaveRangeEnd, }; result.Add(res); } diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs index aad7661c..56eb8300 100644 --- a/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs +++ b/BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestTableResultDto.cs @@ -22,5 +22,9 @@ public DateTime LeaveStartDate { get; set; } = DateTime.Now; public DateTime LeaveEndDate { get; set; } = DateTime.Now; + + public string? LeaveRange { get; set; } = "ALL"; + + public string? LeaveRangeEnd { get; set; } = "ALL"; } }