From 6b9767449c704d7e9990b407a1c3f169e2c80802 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Tue, 9 Dec 2025 10:36:06 +0700 Subject: [PATCH 1/3] fix: skip approver check if no commander is assigned; update leave data retrieval logic --- .../Leaves/LeaveRequests/LeaveRequestRepository.cs | 12 ++++++++++-- BMA.EHR.Leave/Controllers/LeaveReportController.cs | 8 +++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs index 9cc0f65a..6223d786 100644 --- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs +++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs @@ -1103,9 +1103,17 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests throw new Exception(GlobalMessages.DataNotFound); } - if (rawData.ApproveStep != "st3") + // ถ้าไม่มี commander ข้ามไปเช็ค approver ได้เลย + var commanders = rawData.Approvers + .Where(x => x.ApproveType!.ToUpper() == "COMMANDER") + .OrderBy(x => x.Seq) + .ToList(); + if(commanders.Count > 0 || commanders != null) { - throw new Exception("คำขอนี้ยังไม่ได้อยู่ในขั้นตอนที่สามารถอนุมัติได้ ไม่สามารถทำรายการได้"); + if (rawData.ApproveStep != "st3") + { + throw new Exception("คำขอนี้ยังไม่ได้อยู่ในขั้นตอนที่สามารถอนุมัติได้ ไม่สามารถทำรายการได้"); + } } // check commander approve diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs index 3b71a529..43e233ec 100644 --- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs @@ -238,11 +238,13 @@ namespace BMA.EHR.Leave.Service.Controllers if (toDay >= new DateTime(toDay.Year, 10, 1) && toDay <= new DateTime(toDay.Year, 12, 31)) thisYear = thisYear + 1; - var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUserAsync(thisYear, data.Type.Id, data.KeycloakUserId); - - var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear); + var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUser2Async(thisYear, data.Type.Id, data.KeycloakUserId); + //var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUser2Async(thisYear, rawData.Type.Id, rawData.KeycloakUserId); + //var leaveSummary = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed; + //var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear); + var sumLeave = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed; var leaveLimit = leaveData == null ? 0.0 : leaveData.LeaveDays; var extendLeave = leaveLimit - 10; From fc68cb0101d051118170d36acfe6296ec0808901 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Tue, 9 Dec 2025 13:12:54 +0700 Subject: [PATCH 2/3] feat: add DNA update functionality and enrich leave beginning data with profile details --- .../LeaveRequests/LeaveBeginingRepository.cs | 22 ++++++++++-- .../Controllers/LeaveBeginningController.cs | 35 +++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveBeginingRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveBeginingRepository.cs index 8e0429c7..575a85bb 100644 --- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveBeginingRepository.cs +++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveBeginingRepository.cs @@ -293,7 +293,12 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests FirstName = pf.FirstName, LastName = pf.LastName, LeaveDaysUsed = 0, - LeaveDays = leaveType?.Code == "LV-005" ? limit : 0 + LeaveDays = leaveType?.Code == "LV-005" ? limit : 0, + RootDnaId = pf.RootDnaId, + Child1DnaId = pf.Child1DnaId, + Child2DnaId = pf.Child2DnaId, + Child3DnaId = pf.Child3DnaId, + Child4DnaId = pf.Child4DnaId }; _dbContext.Set().Add(data); @@ -305,6 +310,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests public async Task> GetAllByYearAndTypeAsync(int year, Guid typeId, List userIdList) { + + var updateList = new List(); var result = new List(); @@ -321,6 +328,12 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests // continue; // Goto Next Id //} + var profile = await _userProfileRepository.GetProfileByProfileIdAsync(pf.Id, AccessToken); + if (profile == null) + { + return null; + } + var govAge = (pf?.DateStart?.Date ?? DateTime.Now.Date).DiffDay(DateTime.Now.Date); var leaveType = await _dbContext.Set().FirstOrDefaultAsync(x => x.Id == typeId); @@ -368,7 +381,12 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests FirstName = pf.FirstName, LastName = pf.LastName, LeaveDaysUsed = 0, - LeaveDays = leaveType?.Code == "LV-005" ? limit : 0 + LeaveDays = leaveType?.Code == "LV-005" ? limit : 0, + RootDnaId = profile.RootDnaId, + Child1DnaId = profile.Child1DnaId, + Child2DnaId = profile.Child2DnaId, + Child3DnaId = profile.Child3DnaId, + Child4DnaId = profile.Child4DnaId }; updateList.Add(data); diff --git a/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs b/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs index 83bd79d2..d61d82d2 100644 --- a/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveBeginningController.cs @@ -311,6 +311,35 @@ namespace BMA.EHR.Leave.Service.Controllers } } + [HttpGet("update-dna")] + public async Task> UpdateDnaAsync() + { + try + { + var leaveBeginnings = await _context.LeaveBeginnings.ToListAsync(); + foreach (var item in leaveBeginnings) + { + var profile = await _userProfileRepository.GetProfileByProfileIdAsync(item.ProfileId, AccessToken); + if (profile != null) + { + item.RootDnaId = profile.RootDnaId; + item.Child1DnaId = profile.Child1DnaId; + item.Child2DnaId = profile.Child2DnaId; + item.Child3DnaId = profile.Child3DnaId; + item.Child4DnaId = profile.Child4DnaId; + _context.LeaveBeginnings.Update(item); + } + + } + await _context.SaveChangesAsync(); + return Success("อัพเดทข้อมูลสำเร็จ"); + } + catch (Exception ex) + { + return Error(ex); + } + } + // /// แก้ไขรายการ @@ -358,6 +387,12 @@ namespace BMA.EHR.Leave.Service.Controllers leaveBeginning.LastUpdateFullName = FullName ?? ""; leaveBeginning.LastUpdatedAt = DateTime.Now; + leaveBeginning.RootDnaId = profile.RootDnaId; + leaveBeginning.Child1DnaId = profile.Child1DnaId; + leaveBeginning.Child2DnaId = profile.Child2DnaId; + leaveBeginning.Child3DnaId = profile.Child3DnaId; + leaveBeginning.Child4DnaId = profile.Child4DnaId; + await _leaveBeginningRepository.UpdateAsync(leaveBeginning); return Success("แก้ไขข้อมูลสำเร็จ"); } From 59fd20c879ddf5af5d563b3caf880a5f2e8252f2 Mon Sep 17 00:00:00 2001 From: harid Date: Tue, 9 Dec 2025 15:00:18 +0700 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E0=B8=AA=E0=B8=B4=E0=B8=97=E0=B8=98?= =?UTF-8?q?=E0=B8=B4=E0=B9=8C=20PARENT=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1?= =?UTF-8?q?=E0=B8=B9=E0=B8=A5=E0=B9=81=E0=B8=95=E0=B9=88=E0=B8=A5=E0=B8=B0?= =?UTF-8?q?=E0=B8=AA=E0=B8=B3=E0=B8=99=E0=B8=B1=E0=B8=81=E0=B9=84=E0=B8=A1?= =?UTF-8?q?=E0=B9=88=E0=B9=80=E0=B8=97=E0=B9=88=E0=B8=B2=E0=B8=81=E0=B8=B1?= =?UTF-8?q?=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Leave/Controllers/LeaveReportController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs index 43e233ec..9df655d5 100644 --- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs @@ -940,7 +940,7 @@ namespace BMA.EHR.Leave.Service.Controllers var count = 1; var employees = new List(); // กรองตามที่ fe ส่งมา - if ((role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "PARENT") && req.node > profileAdmin?.Node) + if ((role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "PARENT") /*&& req.node > profileAdmin?.Node*/) { profile = profile .Where(x => req.node == 4 ? x.OrgChild4Id == req.nodeId : req.node == 3 ? x.OrgChild3Id == req.nodeId : req.node == 2 ? x.OrgChild2Id == req.nodeId : req.node == 1 ? x.OrgChild1Id == req.nodeId : req.node == 0 ? x.OrgRootId == req.nodeId : true) @@ -1611,7 +1611,7 @@ namespace BMA.EHR.Leave.Service.Controllers var workTotal = 0; var seminarTotal = 0; // กรองตามที่ fe ส่งมา - if ((role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "PARENT") && req.node > profileAdmin?.Node) + if ((role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "PARENT") /*&& req.node > profileAdmin?.Node*/) { profile = profile .Where(x => req.node == 4 ? x.OrgChild4Id == req.nodeId : req.node == 3 ? x.OrgChild3Id == req.nodeId : req.node == 2 ? x.OrgChild2Id == req.nodeId : req.node == 1 ? x.OrgChild1Id == req.nodeId : req.node == 0 ? x.OrgRootId == req.nodeId : true) @@ -1877,7 +1877,7 @@ namespace BMA.EHR.Leave.Service.Controllers profile = await _userProfileRepository.GetEmployeeByAdminRole(AccessToken, profileAdmin?.Node, nodeId, role, req.revisionId, req.node, req.nodeId); } // Child กรองตามที่ fe ส่งมาอีกชั้น - if ((role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "PARENT") && req.node > profileAdmin?.Node) + if ((role == "ROOT" || role == "OWNER" || role == "CHILD" || role == "PARENT") /*&& req.node > profileAdmin?.Node*/) { profile = profile .Where(x => req.node == 4 ? x.OrgChild4Id == req.nodeId : req.node == 3 ? x.OrgChild3Id == req.nodeId : req.node == 2 ? x.OrgChild2Id == req.nodeId : req.node == 1 ? x.OrgChild1Id == req.nodeId : req.node == 0 ? x.OrgRootId == req.nodeId : true)