From 12aceb5e001875b359f6d3f658495acbfee50994 Mon Sep 17 00:00:00 2001 From: Bright Date: Thu, 20 Feb 2025 16:59:21 +0700 Subject: [PATCH] add status filter --- .../Controllers/PlacementAppointmentController.cs | 4 +++- .../Controllers/PlacementAppointmentEmployeeController.cs | 5 +++-- .../Controllers/PlacementOfficerController.cs | 5 +++-- .../Controllers/PlacementReceiveController.cs | 4 +++- .../Controllers/PlacementRepatriationController.cs | 4 +++- .../Controllers/PlacementTransferController.cs | 4 +++- .../Controllers/RetirementOtherController.cs | 5 +++-- .../Controllers/RetirementOutController.cs | 5 +++-- 8 files changed, 24 insertions(+), 12 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index 8511c34b..342254c9 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -68,7 +68,7 @@ namespace BMA.EHR.Placement.Service.Controllers /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน [HttpGet()] - public async Task> GetListByAdmin() + public async Task> GetListByAdmin(string? status = "ALL") { var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_PROMOTION_OFFICER", UserId); var jsonData = JsonConvert.DeserializeObject(getPermission); @@ -169,6 +169,8 @@ namespace BMA.EHR.Placement.Service.Controllers p.typeCommand, }) .ToListAsync(); + if (status != null && status.Trim().ToUpper() != "ALL") + placementAppointments = placementAppointments.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList(); return Success(placementAppointments); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs index 11aaef01..ae52a64a 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs @@ -67,7 +67,7 @@ namespace BMA.EHR.Placement.Service.Controllers /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน [HttpGet()] - public async Task> GetListByAdmin() + public async Task> GetListByAdmin(string? status = "ALL") { var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_PROMOTION_EMP", UserId); var jsonData = JsonConvert.DeserializeObject(getPermission); @@ -191,7 +191,8 @@ namespace BMA.EHR.Placement.Service.Controllers // placementAppointments = data; // } - + if (status != null && status.Trim().ToUpper() != "ALL") + placementAppointments = placementAppointments.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList(); return Success(placementAppointments); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs index bfb7ec9b..7f589e2b 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs @@ -68,7 +68,7 @@ namespace BMA.EHR.Placement.Service.Controllers /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน [HttpGet()] - public async Task> GetListByAdmin() + public async Task> GetListByAdmin(string? status = "ALL") { var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_TEMPDUTY", UserId); var jsonData = JsonConvert.DeserializeObject(getPermission); @@ -127,7 +127,8 @@ namespace BMA.EHR.Placement.Service.Controllers p.IsActive, }) .ToListAsync(); - + if (status != null && status.Trim().ToUpper() != "ALL") + placementOfficers = placementOfficers.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList(); return Success(placementOfficers); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index 102c5dcc..55a8c66f 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -69,7 +69,7 @@ namespace BMA.EHR.Placement.Service.Controllers /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน [HttpGet()] - public async Task> GetListByAdmin() + public async Task> GetListByAdmin(string? status = "ALL") { var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_TRANSFER_RECEIVE", UserId); var jsonData = JsonConvert.DeserializeObject(getPermission); @@ -164,6 +164,8 @@ namespace BMA.EHR.Placement.Service.Controllers p.profileId, }) .ToListAsync(); + if (status != null && status.Trim().ToUpper() != "ALL") + placementReceives = placementReceives.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList(); return Success(placementReceives); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs index 0dfd8e8c..6c65ce03 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs @@ -69,7 +69,7 @@ namespace BMA.EHR.Placement.Service.Controllers /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน [HttpGet()] - public async Task> GetListByAdmin() + public async Task> GetListByAdmin(string? status = "ALL") { var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_TEMPDUTY2", UserId); var jsonData = JsonConvert.DeserializeObject(getPermission); @@ -132,6 +132,8 @@ namespace BMA.EHR.Placement.Service.Controllers p.DateRepatriation, }) .ToListAsync(); + if (status != null && status.Trim().ToUpper() != "ALL") + placementRepatriations = placementRepatriations.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList(); return Success(placementRepatriations); } diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index 9eb2f0fc..f545dce7 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -161,7 +161,7 @@ namespace BMA.EHR.Placement.Service.Controllers /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน [HttpGet()] - public async Task> GetListByAdmin() + public async Task> GetListByAdmin(string? status = "ALL") { var getPermission = await _permission.GetPermissionOrgAPIAsync("LIST", "SYS_TRANSFER_REQ", UserId); var jsonData = JsonConvert.DeserializeObject(getPermission); @@ -224,6 +224,8 @@ namespace BMA.EHR.Placement.Service.Controllers p.IsActive, }) .ToListAsync(); + if (status != null && status.Trim().ToUpper() != "ALL") + placementTransfers = placementTransfers.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList(); return Success(placementTransfers); } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index 78b362e9..893ba38d 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -68,7 +68,7 @@ namespace BMA.EHR.Retirement.Service.Controllers /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน [HttpGet()] - public async Task> GetListByAdmin() + public async Task> GetListByAdmin(string? status = "ALL") // public async Task> GetListByAdmin(int page = 1, int pageSize = 10, string keyword = "") { var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_PLACEMENT_OTHER"); @@ -166,7 +166,8 @@ namespace BMA.EHR.Retirement.Service.Controllers // retirementOthers = data; // } - + if (status != null && status.Trim().ToUpper() != "ALL") + retirementOthers = retirementOthers.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList(); return Success(retirementOthers); } } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs index b77658b0..c84639f8 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs @@ -69,7 +69,7 @@ namespace BMA.EHR.Retirement.Service.Controllers /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน [HttpGet("{type}")] - public async Task> GetListByAdmin(string type) + public async Task> GetListByAdmin(string type, string? status = "WAITTING") { var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_DISMISS"); var jsonData = JsonConvert.DeserializeObject(getPermission); @@ -148,7 +148,8 @@ namespace BMA.EHR.Retirement.Service.Controllers p.IsActive, }) .ToListAsync(); - + if (status != null && status.Trim().ToUpper() != "WAITTING") + retirementOuts = retirementOuts.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList(); return Success(retirementOuts); } }