diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index 08022767..8c3336f1 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -69,7 +69,7 @@ namespace BMA.EHR.Placement.Service.Controllers /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน [HttpGet()] - public async Task> GetListByAdmin() + public async Task> GetListByAdmin(int page = 1, int pageSize = 10, string keyword = "") { var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_PROMOTION_OFFICER"); var jsonData = JsonConvert.DeserializeObject(getPermission); @@ -164,7 +164,30 @@ namespace BMA.EHR.Placement.Service.Controllers // if (PlacementAdmin == true) // placementAppointments.Where(x => x.Status.Trim().ToUpper().Contains("PENDING")); - return Success(placementAppointments); + if (keyword != "") + { + var data = placementAppointments.Where(x => + (x.citizenId != null && x.citizenId.Contains(keyword)) || + (x.prefix != null && x.prefix.Contains(keyword)) || + (x.firstName != null && x.firstName.Contains(keyword)) || + (x.lastName != null && x.lastName.Contains(keyword)) || + (x.rootShortNameOld != null && x.rootShortNameOld.Contains(keyword)) || + (x.posMasterNoOld != null && x.posMasterNoOld.ToString().Contains(keyword)) || + (x.OrganizationOld != null && x.OrganizationOld.Contains(keyword)) || + (x.posTypeNameOld != null && x.posTypeNameOld.Contains(keyword)) || + (x.posLevelNameOld != null && x.posLevelNameOld.Contains(keyword)) || + (x.OrganizationPositionOld != null && x.OrganizationPositionOld.Contains(keyword)) || + (x.Reason != null && x.Reason.Contains(keyword)) || + (x.nodeName != null && x.nodeName.Contains(keyword))) + .OrderByDescending(x => x.CreatedAt) + .Skip((page - 1) * pageSize) + .Take(pageSize) + .ToList(); + + placementAppointments = data; + } + + return Success(new { data = placementAppointments, total = placementAppointments.Count }); } /// diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs index 351a5995..c19c1f58 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs @@ -69,7 +69,7 @@ namespace BMA.EHR.Placement.Service.Controllers /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน [HttpGet()] - public async Task> GetListByAdmin() + public async Task> GetListByAdmin(int page = 1, int pageSize = 10, string keyword = "") { var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_PROMOTION_EMP"); var jsonData = JsonConvert.DeserializeObject(getPermission); @@ -161,8 +161,30 @@ namespace BMA.EHR.Placement.Service.Controllers p.typeCommand, }) .ToListAsync(); + if (keyword != "") + { + var data = placementAppointments.Where(x => + (x.citizenId != null && x.citizenId.Contains(keyword)) || + (x.prefix != null && x.prefix.Contains(keyword)) || + (x.firstName != null && x.firstName.Contains(keyword)) || + (x.lastName != null && x.lastName.Contains(keyword)) || + (x.rootShortNameOld != null && x.rootShortNameOld.Contains(keyword)) || + (x.posMasterNoOld != null && x.posMasterNoOld.ToString().Contains(keyword)) || + (x.OrganizationOld != null && x.OrganizationOld.Contains(keyword)) || + (x.posTypeNameOld != null && x.posTypeNameOld.Contains(keyword)) || + (x.posLevelNameOld != null && x.posLevelNameOld.Contains(keyword)) || + (x.OrganizationPositionOld != null && x.OrganizationPositionOld.Contains(keyword)) || + (x.Reason != null && x.Reason.Contains(keyword)) || + (x.nodeName != null && x.nodeName.Contains(keyword))) + .OrderByDescending(x => x.CreatedAt) + .Skip((page - 1) * pageSize) + .Take(pageSize) + .ToList(); - return Success(placementAppointments); + placementAppointments = data; + } + + return Success(new { data = placementAppointments, total = placementAppointments.Count }); } /// diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index c70632b5..1b72205a 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -17,6 +17,8 @@ using Microsoft.Extensions.Configuration; using System.Net.Http.Headers; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using Microsoft.AspNetCore.Http.HttpResults; +using System.Drawing.Drawing2D; namespace BMA.EHR.Placement.Service.Controllers { @@ -90,7 +92,7 @@ namespace BMA.EHR.Placement.Service.Controllers } [HttpGet("exam/{year}")] - public async Task> GetExam(int year) + public async Task> 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) @@ -107,9 +109,22 @@ namespace BMA.EHR.Placement.Service.Controllers AccountEndDate = x.EndDate, AccountExpirationDate = x.EndDate, 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(); - return Success(data); + data = data_; + } + return Success( new { data, total = data.Count }); } [HttpGet("pass/{examId:length(36)}")] diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs index 24f0b17e..70c12ae9 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -69,7 +69,7 @@ namespace BMA.EHR.Placement.Service.Controllers /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน [HttpGet()] - public async Task> GetListByAdmin() + public async Task> GetListByAdmin(int page = 1, int pageSize = 10, string keyword = "") { var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_TEMPDUTY"); var jsonData = JsonConvert.DeserializeObject(getPermission); @@ -142,7 +142,27 @@ namespace BMA.EHR.Placement.Service.Controllers }) .ToListAsync(); - return Success(placementOfficers); + if (keyword != "") + { + var data = placementOfficers.Where(x => + (x.prefix != null && x.prefix.Contains(keyword)) || + (x.firstName != null && x.firstName.Contains(keyword)) || + (x.lastName != null && x.lastName.Contains(keyword)) || + (x.rootShortNameOld != null && x.rootShortNameOld.Contains(keyword)) || + (x.posMasterNoOld != null && x.posMasterNoOld.ToString().Contains(keyword)) || + (x.PositionOld != null && x.PositionOld.Contains(keyword)) || + (x.posTypeNameOld != null && x.posTypeNameOld.Contains(keyword)) || + (x.posLevelNameOld != null && x.posLevelNameOld.Contains(keyword)) || + (x.Organization != null && x.Organization.Contains(keyword))) + .OrderByDescending(x => x.CreatedAt) + .Skip((page - 1) * pageSize) + .Take(pageSize) + .ToList(); + + placementOfficers = data; + } + + return Success(new { data = placementOfficers, total = placementOfficers.Count }); } } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index a366d428..29056249 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -180,6 +180,7 @@ namespace BMA.EHR.Placement.Service.Controllers .ToListAsync(); // if (PlacementAdmin == true) // placementReceives.Where(x => x.Status.Trim().ToUpper().Contains("PENDING")); + if (keyword != "") { var data = placementReceives.Where(x => @@ -197,7 +198,7 @@ namespace BMA.EHR.Placement.Service.Controllers placementReceives = data; } - return Success(placementReceives); + return Success(new { data = placementReceives, total = placementReceives.Count }); // } } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs index c8ae57ee..0336cd3f 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs @@ -70,7 +70,7 @@ namespace BMA.EHR.Placement.Service.Controllers /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน [HttpGet()] - public async Task> GetListByAdmin() + public async Task> GetListByAdmin(int page = 1, int pageSize = 10, string keyword = "") { var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_TEMPDUTY2"); var jsonData = JsonConvert.DeserializeObject(getPermission); @@ -148,7 +148,28 @@ namespace BMA.EHR.Placement.Service.Controllers }) .ToListAsync(); - return Success(placementRepatriations); + if (keyword != "") + { + var data = placementRepatriations.Where(x => + (x.prefix != null && x.prefix.Contains(keyword)) || + (x.firstName != null && x.firstName.Contains(keyword)) || + (x.lastName != null && x.lastName.Contains(keyword)) || + (x.rootShortNameOld != null && x.rootShortNameOld.Contains(keyword)) || + (x.posMasterNoOld != null && x.posMasterNoOld.ToString().Contains(keyword)) || + (x.PositionOld != null && x.PositionOld.Contains(keyword)) || + (x.posTypeNameOld != null && x.posTypeNameOld.Contains(keyword)) || + (x.posLevelNameOld != null && x.posLevelNameOld.Contains(keyword)) || + (x.OrganizationPositionOld != null && x.OrganizationPositionOld.Contains(keyword)) || + (x.Organization != null && x.Organization.Contains(keyword))) + .OrderByDescending(x => x.CreatedAt) + .Skip((page - 1) * pageSize) + .Take(pageSize) + .ToList(); + + placementRepatriations = data; + } + + return Success(new { data = placementRepatriations, total = placementRepatriations.Count }); } } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index 38b9c196..b847e237 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -142,7 +142,7 @@ namespace BMA.EHR.Placement.Service.Controllers /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน [HttpGet()] - public async Task> GetListByAdmin() + public async Task> GetListByAdmin(int page = 1, int pageSize = 10, string keyword = "") { var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_TRANSFER_REQ"); var jsonData = JsonConvert.DeserializeObject(getPermission); @@ -219,7 +219,23 @@ namespace BMA.EHR.Placement.Service.Controllers }) .ToListAsync(); - return Success(placementTransfers); + 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; + } + + return Success(new { data = placementTransfers, total = placementTransfers.Count }); } } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index 3138d35e..e102e0a4 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -69,7 +69,7 @@ namespace BMA.EHR.Retirement.Service.Controllers /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน [HttpGet()] - public async Task> GetListByAdmin() + public async Task> GetListByAdmin(int page = 1, int pageSize = 10, string keyword = "") { var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_PLACEMENT_OTHER"); var jsonData = JsonConvert.DeserializeObject(getPermission); @@ -146,8 +146,27 @@ namespace BMA.EHR.Retirement.Service.Controllers CommandType = p.CommandType == null ? null : p.CommandType.Name, }) .ToListAsync(); + if (keyword != "") + { + var data = retirementOthers.Where(x => + (x.prefix != null && x.prefix.Contains(keyword)) || + (x.firstName != null && x.firstName.Contains(keyword)) || + (x.lastName != null && x.lastName.Contains(keyword)) || + (x.rootShortNameOld != null && x.rootShortNameOld.Contains(keyword)) || + (x.posMasterNoOld != null && x.posMasterNoOld.ToString().Contains(keyword)) || + (x.posTypeNameOld != null && x.posTypeNameOld.Contains(keyword)) || + (x.posLevelNameOld != null && x.posLevelNameOld.Contains(keyword)) || + (x.OrganizationPositionOld != null && x.OrganizationPositionOld.Contains(keyword)) || + (x.Reason != null && x.Reason.Contains(keyword))) + .OrderByDescending(x => x.CreatedAt) + .Skip((page - 1) * pageSize) + .Take(pageSize) + .ToList(); - return Success(retirementOthers); + retirementOthers = data; + } + + return Success(new { data = retirementOthers, total = retirementOthers.Count }); } }