- commander position

BMA.EHR.Leave/Controllers/LeaveRequestController.cs

@@ -170,6 +170,7 @@ namespace BMA.EHR.Leave.Service.Controllers
             var leaveRequest = new LeaveRequest
             {
                 Type = leaveType,
+                
                 LeaveSubTypeName = req.LeaveSubTypeName,
                 LeaveRange = req.LeaveRange,
                 LeaveStartDate = req.LeaveStartDate,
@@ -356,6 +357,10 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             leaveRequest.LeaveTypeCode = leaveType.Code;
             leaveRequest.Dear = approver;
+
+            // เพิ่มตำแหน่ง
+            //leaveRequest.CommanderPosition = req.CommanderPosition ?? "";
+
             leaveRequest.PositionName = profile.Position == null ? "" : profile.Position;
             leaveRequest.PositionLevelName = profile.PosLevel == null ? "" : profile.PosLevel;
             leaveRequest.OrganizationName = userOc;
@@ -471,6 +476,8 @@ namespace BMA.EHR.Leave.Service.Controllers
             oldData.LeaveTotal = req.LeaveTotal;
             oldData.LeaveSalaryText = req.LeaveSalaryText ?? "";
 
+            //oldData.CommanderPosition = req.CommanderPosition ?? "";
+
             /*** remove old code
 
             var leaveRequest = new LeaveRequest
@@ -636,6 +643,10 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             oldData.LeaveTypeCode = leaveType.Code;
             oldData.Dear = profile.Commander ?? "";
+
+            //oldData.CommanderPosition = profile.CommanderPosition ?? "";
+
+
             oldData.PositionName = profile.Position == null ? "" : profile.Position;
             oldData.PositionLevelName = profile.PosLevel == null ? "" : profile.PosLevel;
             oldData.OrganizationName = profile.Oc ?? "";
@@ -1322,6 +1333,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 CoupleDaySumTotalHistory = rawData.CoupleDaySumTotalHistory,
 
                 Dear = rawData.Dear ?? "",
+                CommanderPosition = rawData.CommanderPosition ?? "",
                 PositionName = rawData.PositionName ?? "",
                 PositionLevelName = rawData.PositionLevelName ?? "",
                 OrganizationName = orgName,
@@ -1975,6 +1987,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 // เปลี่ยนมาอ่านจากฐานข้อมูลแทน read_db
 
                 Dear = rawData.Dear ?? "",
+                CommanderPosition   = rawData.CommanderPosition ?? "",
                 PositionName = rawData.PositionName ?? "",
                 PositionLevelName = rawData.PositionLevelName ?? "",
                 OrganizationName = orgName,

BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs

@@ -128,5 +128,7 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
         public string? OrganizationName { get; set; } = string.Empty;
 
         public DateTime? LeaveLast { get; set; }
+
+        public string? CommanderPosition { get; set; } = string.Empty;  
     }
 }

BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminByIdDto.cs

@@ -136,5 +136,7 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
 
         public string LeaveRange { get; set; } = string.Empty;
         public string? ProfileType { get; set; }
+
+        public string? CommanderPosition { get; set; } = string.Empty;
     }
 }

BMA.EHR.Leave/DTOs/LeaveRequest/GetUserLeaveProfileResultDto.cs

@@ -8,6 +8,10 @@
 
         public string Dear { get; set; }
 
+        public string? LeaveSubTypeName { get; set; } = string.Empty;
+
+        public string? CommanderPosition { get; set; } = string.Empty;
+
         public string FullName { get; set; }
 
         public string PositionName { get; set; }