เพิ่ม DateSendLeave และปรับ Logic การดึงค่าวันที่ยื่นลา #1567

BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs

@@ -904,6 +904,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
 
             rawData.LeaveStatus = "NEW";
+            rawData.DateSendLeave = DateTime.Now; // Update วันที่ยื่นลาเป็นวันที่ปัจจุบัน
             //rawData.ApproveStep = "st2";
 
             await UpdateAsync(rawData);

BMA.EHR.Domain/Models/Leave/Requests/LeaveRequest.cs

@@ -210,5 +210,7 @@ namespace BMA.EHR.Domain.Models.Leave.Requests
 
         public Guid? Child4DnaId { get; set; } = Guid.Empty;
 
+        public DateTime? DateSendLeave { get; set; }
+
     }
 }

BMA.EHR.Infrastructure/Migrations/LeaveDb/20260423083625_Add DateSendLeave.cs

@@ -0,0 +1,29 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
+{
+    /// <inheritdoc />
+    public partial class AddDateSendLeave : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "DateSendLeave",
+                table: "LeaveRequests",
+                type: "datetime(6)",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DateSendLeave",
+                table: "LeaveRequests");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/LeaveDb/LeaveDbContextModelSnapshot.cs

@@ -428,6 +428,9 @@ namespace BMA.EHR.Infrastructure.Migrations.LeaveDb
                     b.Property<DateTime?>("DateAppoint")
                         .HasColumnType("datetime(6)");
 
+                    b.Property<DateTime?>("DateSendLeave")
+                        .HasColumnType("datetime(6)");
+
                     b.Property<string>("Dear")
                         .HasColumnType("longtext")
                         .HasComment("เรียนใคร");

BMA.EHR.Leave/Controllers/LeaveReportController.cs

@@ -182,7 +182,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 data = new
                 {
                     leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
-                    dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
+                    dateSendLeave = data.DateSendLeave != null ? data.DateSendLeave.Value.Date.ToThaiShortDate().ToThaiNumber() : data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
                     leaveTypeName = data.Type.Name,
                     leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
@@ -272,7 +272,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 data = new
                 {
                     leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
-                    dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
+                    dateSendLeave = data.DateSendLeave != null ? data.DateSendLeave.Value.Date.ToThaiShortDate().ToThaiNumber() : data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
                     leaveTypeName = data.Type.Name,
                     leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
@@ -366,7 +366,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 data = new
                 {
                     leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
-                    dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
+                    dateSendLeave = data.DateSendLeave != null ? data.DateSendLeave.Value.Date.ToThaiShortDate().ToThaiNumber() : data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
                     leaveTypeName = data.Type.Name,
                     leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
@@ -461,7 +461,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     data = new
                     {
                         leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
-                        dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
+                        dateSendLeave = data.DateSendLeave != null ? data.DateSendLeave.Value.Date.ToThaiShortDate().ToThaiNumber() : data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
                         leaveTypeName = data.Type.Name,
                         leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                         dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
@@ -515,7 +515,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     data = new
                     {
                         leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
-                        dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
+                        dateSendLeave = data.DateSendLeave != null ? data.DateSendLeave.Value.Date.ToThaiShortDate().ToThaiNumber() : data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
                         leaveTypeName = data.Type.Name,
                         leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                         dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
@@ -602,7 +602,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 data = new
                 {
                     leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
-                    dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
+                    dateSendLeave = data.DateSendLeave != null ? data.DateSendLeave.Value.Date.ToThaiShortDate().ToThaiNumber() : data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
                     leaveTypeName = data.Type.Name,
                     leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
@@ -683,7 +683,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 data = new
                 {
                     leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
-                    dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
+                    dateSendLeave = data.DateSendLeave != null ? data.DateSendLeave.Value.Date.ToThaiShortDate().ToThaiNumber() : data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
                     leaveTypeName = data.Type.Name,
                     leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
@@ -786,7 +786,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 data = new
                 {
                     leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
-                    dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
+                    dateSendLeave = data.DateSendLeave != null ? data.DateSendLeave.Value.Date.ToThaiShortDate().ToThaiNumber() : data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
                     leaveTypeName = data.Type.Name,
                     leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
@@ -905,7 +905,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 data = new
                 {
                     leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
-                    dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
+                    dateSendLeave = data.DateSendLeave != null ? data.DateSendLeave.Value.Date.ToThaiShortDate().ToThaiNumber() : data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
                     leaveTypeName = data.Type.Name,
                     leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
@@ -1001,7 +1001,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 data = new
                 {
                     leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
-                    dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
+                    dateSendLeave = data.DateSendLeave != null ? data.DateSendLeave.Value.Date.ToThaiShortDate().ToThaiNumber() : data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
                     leaveTypeName = data.Type.Name,
                     leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
                     dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
@@ -1227,7 +1227,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     data = new
                     {
                         leaveWrote = data.CancelLeaveWrote!.ToThaiNumber() ?? "",
-                        dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
+                        dateSendLeave = data.DateSendLeave != null ? data.DateSendLeave.Value.Date.ToThaiShortDate().ToThaiNumber() : data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
                         leaveTypeName = data.Type.Name,
                         fullname = fullName,
                         position = string.IsNullOrEmpty(profile.Position) ? "-" : profile.Position,

BMA.EHR.Leave/Controllers/LeaveRequestController.cs

@@ -1324,7 +1324,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                   Id = d.Id,
                                   LeaveTypeId = d.Type.Id,
                                   LeaveTypeName = d.Type.Name,
-                                  DateSendLeave = d.CreatedAt.Date,
+                                  DateSendLeave = d.DateSendLeave != null ? d.DateSendLeave.Value.Date : d.CreatedAt.Date,
                                   Status = d.LeaveStatus,
                                   FullName = $"{d.Prefix}{d.FirstName} {d.LastName}",
                                   LeaveEndDate = d.LeaveEndDate,
@@ -1481,7 +1481,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                   Id = d.Id,
                                   LeaveTypeId = d.Type.Id,
                                   LeaveTypeName = d.Type.Name,
-                                  DateSendLeave = d.CreatedAt.Date,
+                                  DateSendLeave = d.DateSendLeave != null ? d.DateSendLeave.Value.Date : d.CreatedAt.Date,
                                   Status = d.LeaveStatus,
                                   FullName = $"{d.Prefix}{d.FirstName} {d.LastName}",
                                   LeaveEndDate = d.LeaveEndDate,
@@ -1534,7 +1534,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     LeaveTypeName = item.Type.Name,
                     LeaveSubTypeName = item.LeaveSubTypeName ?? "",
                     FullName = $"{item.Prefix}{item.FirstName} {item.LastName}",
-                    DateSendLeave = item.CreatedAt,
+                    DateSendLeave = item.DateSendLeave ?? item.CreatedAt,
                     IsDelete = item.LeaveStatus == "DELETE",
                     Status = item.LeaveStatus,
                     LeaveStartDate = item.LeaveStartDate,
@@ -1709,7 +1709,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 LeaveSubTypeName = rawData.LeaveSubTypeName,
                 LeaveTypeId = rawData.Type.Id,
                 FullName = $"{rawData.Prefix}{rawData.FirstName} {rawData.LastName}",
-                DateSendLeave = rawData.CreatedAt,
+                DateSendLeave = rawData.DateSendLeave ?? rawData.CreatedAt,
                 Status = rawData.LeaveStatus,
                 LeaveStartDate = rawData.LeaveStartDate,
                 LeaveEndDate = rawData.LeaveEndDate,
@@ -1982,7 +1982,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     LeaveSubTypeName = item.LeaveSubTypeName,
                     FullName = $"{item.Prefix}{item.FirstName} {item.LastName}",
                     ProfileType = item.ProfileType ?? "-",
-                    DateSendLeave = item.CreatedAt,
+                    DateSendLeave = item.DateSendLeave ?? item.CreatedAt,
                     Status = item.LeaveStatus,
                     CitizenId = item.CitizenId ?? "",
                     LeaveStartDate = item.LeaveStartDate,
@@ -2275,7 +2275,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     LeaveSubTypeName = item.LeaveSubTypeName,
                     ProfileType = item.ProfileType ?? "-",
                     FullName = $"{item.Prefix}{item.FirstName} {item.LastName}",
-                    DateSendLeave = item.CreatedAt.Date,
+                    DateSendLeave = item.DateSendLeave != null ? item.DateSendLeave.Value.Date : item.CreatedAt.Date,
                     Status = item.LeaveCancelStatus ?? ""
                 };
                 result.Add(res);
@@ -2848,7 +2848,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 LeaveSubTypeName = rawData.LeaveSubTypeName,
                 LeaveTypeId = rawData.Type.Id,
                 FullName = $"{rawData.Prefix}{rawData.FirstName} {rawData.LastName}",
-                DateSendLeave = rawData.CreatedAt,
+                DateSendLeave = rawData.DateSendLeave ?? rawData.CreatedAt,
                 Status = rawData.LeaveStatus,
                 LeaveStartDate = rawData.LeaveStartDate,
                 LeaveEndDate = rawData.LeaveEndDate,