From 3f31f68c607da33abf12fd73bd145aebde89431f Mon Sep 17 00:00:00 2001 From: Bright Date: Tue, 13 May 2025 14:29:49 +0700 Subject: [PATCH 1/5] =?UTF-8?q?fix=20=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97?= =?UTF-8?q?=E0=B8=B6=E0=B8=81=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9E=E0=B8=B4?= =?UTF-8?q?=E0=B8=88=E0=B8=B2=E0=B8=A3=E0=B8=93=E0=B8=B2=E0=B8=82=E0=B8=AD?= =?UTF-8?q?=E0=B8=87=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B8=82=E0=B8=AD?= =?UTF-8?q?=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=81=E0=B8=A3?= =?UTF-8?q?=E0=B8=93=E0=B8=B5=E0=B9=80=E0=B8=AA=E0=B9=89=E0=B8=99=E0=B8=AD?= =?UTF-8?q?=E0=B8=99=E0=B8=B8=E0=B8=A1=E0=B8=B1=E0=B8=95=E0=B8=B4=20?= =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=AA?= =?UTF-8?q?=E0=B8=B4=E0=B9=89=E0=B8=99=E0=B8=AA=E0=B8=B8=E0=B8=94=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=A2=E0=B8=B1=E0=B8=9A=E0=B8=A2=E0=B8=B1?= =?UTF-8?q?=E0=B9=89=E0=B8=87=E0=B8=95=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B8=A7?= =?UTF-8?q?=E0=B9=88=E0=B8=B2=E0=B8=87=20#1518?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Application/Repositories/RetirementRepository.cs | 8 ++++---- .../Controllers/RetirementResignController.cs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BMA.EHR.Application/Repositories/RetirementRepository.cs b/BMA.EHR.Application/Repositories/RetirementRepository.cs index eb25ebd2..4de888e2 100644 --- a/BMA.EHR.Application/Repositories/RetirementRepository.cs +++ b/BMA.EHR.Application/Repositories/RetirementRepository.cs @@ -137,7 +137,7 @@ namespace BMA.EHR.Application.Repositories await _dbContext.SaveChangesAsync(); } - public async Task CommanderApproveRetirementResign(Guid id, string reason, DateTime date) + public async Task CommanderApproveRetirementResign(Guid id, string reason, DateTime? date) { // Get UserId from token var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId); @@ -220,7 +220,7 @@ namespace BMA.EHR.Application.Repositories } } - public async Task CommanderRejectRetirementResign(Guid id, string reason, DateTime date) + public async Task CommanderRejectRetirementResign(Guid id, string reason, DateTime? date) { // Get UserId from token var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId); @@ -307,7 +307,7 @@ namespace BMA.EHR.Application.Repositories } - public async Task ApproveRetirementResign(Guid id, string reason, DateTime date) + public async Task ApproveRetirementResign(Guid id, string reason, DateTime? date) { // Get UserId from token var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId); @@ -387,7 +387,7 @@ namespace BMA.EHR.Application.Repositories } - public async Task RejectRetirementResign(Guid id, string reason, DateTime date) + public async Task RejectRetirementResign(Guid id, string reason, DateTime? date) { // Get UserId from token var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId); diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 4ca0cd89..759a68a3 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -2663,7 +2663,7 @@ namespace BMA.EHR.Retirement.Service.Controllers // { // return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); // } - await _repository.CommanderApproveRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now); + await _repository.CommanderApproveRetirementResign(id, req.Reason ?? "", null); return Success(); } @@ -2697,7 +2697,7 @@ namespace BMA.EHR.Retirement.Service.Controllers // { // return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); // } - await _repository.CommanderRejectRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now); + await _repository.CommanderRejectRetirementResign(id, req.Reason ?? "", req.Date); return Success(); } @@ -2731,7 +2731,7 @@ namespace BMA.EHR.Retirement.Service.Controllers // { // return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); // } - await _repository.ApproveRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now); + await _repository.ApproveRetirementResign(id, req.Reason ?? "", null); return Success(); } @@ -2765,7 +2765,7 @@ namespace BMA.EHR.Retirement.Service.Controllers // { // return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); // } - await _repository.RejectRetirementResign(id, req.Reason ?? "", req.Date ?? DateTime.Now); + await _repository.RejectRetirementResign(id, req.Reason ?? "", req.Date); return Success(); } From 741eccd933ace4efd18457dc32fbd9277ac351c7 Mon Sep 17 00:00:00 2001 From: moss <> Date: Wed, 14 May 2025 11:36:38 +0700 Subject: [PATCH 2/5] =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97?= =?UTF-8?q?=E0=B8=B6=E0=B8=81=E0=B9=80=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=99?= =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B8=A5=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Leave/Controllers/LeaveRequestController.cs | 8 ++++---- BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index 3591e8f5..d743fce5 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -411,7 +411,7 @@ namespace BMA.EHR.Leave.Service.Controllers // add dear and oc_data //var rootOc = _userProfileRepository.GetRootOcId(profile.OcId ?? Guid.Empty, AccessToken); - var approver = profile.Commander ?? ""; + // var approver = profile.Commander ?? ""; var userOc = profile.Root ?? ""; //if (rootOc != null) //{ @@ -422,8 +422,8 @@ namespace BMA.EHR.Leave.Service.Controllers leaveRequest.LeaveTypeCode = leaveType.Code; - leaveRequest.Dear = approver; - leaveRequest.CommanderPosition = profile.CommanderPositionName ?? ""; + leaveRequest.Dear = req.Commander ?? ""; + leaveRequest.CommanderPosition = req.CommanderPositionName ?? ""; // เพิ่มตำแหน่ง //leaveRequest.CommanderPosition = req.CommanderPosition ?? ""; @@ -1772,7 +1772,7 @@ namespace BMA.EHR.Leave.Service.Controllers else if (role == "ROOT") { nodeId = profileAdmin?.RootDnaId; - } + } var rawData = await _leaveRequestRepository.GetCancelLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, role, nodeId, profileAdmin?.Node); diff --git a/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs b/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs index b8cc2c03..21ceea77 100644 --- a/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs +++ b/BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs @@ -102,7 +102,11 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest public DateTime? CoupleDayEndDateHistory { get; set; } public string? CoupleDaySumTotalHistory { get; set; } + + public string? Commander { get; set; } + + public string? CommanderPositionName { get; set; } } - + } From c7dd897909b697a0dd3e089044dcc88c4fa40f7e Mon Sep 17 00:00:00 2001 From: Bright Date: Wed, 14 May 2025 12:04:42 +0700 Subject: [PATCH 3/5] =?UTF-8?q?fix=20=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A?= =?UTF-8?q?=E0=B8=A5=E0=B8=B2=20>>=20=E0=B9=81=E0=B8=9A=E0=B8=9A=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=20(=E0=B8=A5?= =?UTF-8?q?=E0=B8=B2=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=81=E0=B8=AD=E0=B8=9A?= =?UTF-8?q?=E0=B8=9E=E0=B8=B4=E0=B8=98=E0=B8=B5=E0=B8=AE=E0=B8=B1=E0=B8=88?= =?UTF-8?q?=E0=B8=8D=E0=B9=8C)=20#1493?= 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, 5 insertions(+), 1 deletion(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs index b58c5821..b33c2a1e 100644 --- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs @@ -355,8 +355,12 @@ namespace BMA.EHR.Leave.Service.Controllers // if (list.Count > 0) // approver = list.First().Name; //} + if (data != null && data.LeaveSubTypeName == "ลาประกอบพิธีฮัจญ์" && isHajj == false) + { + isHajj = true; + } - if (data.HajjDayStatus == true) + if (isHajj == true) { return new { From a81b8d50fb83925daffff6ccabc8279120f4da15 Mon Sep 17 00:00:00 2001 From: moss <> Date: Wed, 14 May 2025 12:35:26 +0700 Subject: [PATCH 4/5] =?UTF-8?q?=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=AD?= =?UTF-8?q?=E0=B8=A2=E0=B8=B9=E0=B9=88=E0=B8=A3=E0=B8=B0=E0=B8=AB=E0=B8=A7?= =?UTF-8?q?=E0=B9=88=E0=B8=B2=E0=B8=87=E0=B8=A5=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Leave/Controllers/LeaveRequestController.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index d743fce5..09e04816 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -934,12 +934,12 @@ namespace BMA.EHR.Leave.Service.Controllers SalaryText = lastSalary == null ? "" : lastSalary.Amount == null ? "" : ((int)lastSalary.Amount.Value).ToThaiBahtText(false), LeaveLast = leaveLast == null ? null : leaveLast, - TelephoneNumber = profile.TelephoneNumber ?? "-", - CurrentAddress = profile.CurrentAddress ?? "-", - CurrentSubDistrict = profile.CurrentSubDistrict ?? "-", - CurrentDistrict = profile.CurrentDistrict ?? "-", - CurrentProvince = profile.CurrentProvince ?? "-", - CurrentZipCode = profile.CurrentZipCode ?? "-", + TelephoneNumber = profile.TelephoneNumber ?? "", + CurrentAddress = profile.CurrentAddress ?? "", + CurrentSubDistrict = profile.CurrentSubDistrict ?? "", + CurrentDistrict = profile.CurrentDistrict ?? "", + CurrentProvince = profile.CurrentProvince ?? "", + CurrentZipCode = profile.CurrentZipCode ?? "", }; return Success(result); From 5a33e4690de440f2326e6ccc327f8e227b626250 Mon Sep 17 00:00:00 2001 From: moss <> Date: Wed, 14 May 2025 15:26:08 +0700 Subject: [PATCH 5/5] add isDeputy --- BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs b/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs index 75442ae2..b5192b46 100644 --- a/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs +++ b/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs @@ -289,8 +289,8 @@ namespace BMA.EHR.Insignia.Service.Controllers /// ค่าตัวแปรที่ส่งมาไม่ถูกต้อง /// ไม่ได้ Login เข้าระบบ /// เมื่อเกิดข้อผิดพลาดในการทำงาน - [HttpGet("{insigniaPeriodId:length(36)}/{ocId:length(36)}/{role}/{status}")] - public async Task> GetInsignaiRequestBkk(Guid insigniaPeriodId, Guid ocId, string role, string status) + [HttpGet("{insigniaPeriodId:length(36)}/{ocId:length(36)}/{role}/{status}/{isDeputy}")] + public async Task> GetInsignaiRequestBkk(Guid insigniaPeriodId, Guid ocId, string role, string status, bool isDeputy) { var result = await _repository.GetInsigniaRequest(insigniaPeriodId, ocId); if (result != null) @@ -315,7 +315,7 @@ namespace BMA.EHR.Insignia.Service.Controllers Items = new List() }; GetIsOfficerDto RoleInsignia = await _userProfileRepository.GetIsOfficerRootAsync(AccessToken, "SYS_INSIGNIA_MANAGE"); - if (RoleInsignia.isOfficer == true && result.RequestStatus != "st6") + if (RoleInsignia.isOfficer == true && isDeputy == false && result.RequestStatus != "st6") return Success(resend); if (RoleInsignia.isDirector == true && (result.RequestStatus == "st1" || result.RequestStatus == "st2")) return Success(resend);