เหตุผลอนุมัติระบบลา

BMA.EHR.Domain/Models/Retirement/RetirementResign.cs

@@ -41,12 +41,16 @@ namespace BMA.EHR.Domain.Models.Retirement
         public bool IsActive { get; set; } = true;
         [Comment("สถานะยับยั้งผู้ดูแล")]
         public bool? OligarchReject { get; set; }
+        [Comment("เหตุผลอนุมัติผู้ดูแล")]
+        public string? OligarchApproveReason { get; set; }
         [Comment("เหตุผลยับยั้งผู้ดูแล")]
         public string? OligarchRejectReason { get; set; }
         [Comment("วันที่ยับยั้งผู้ดูแล")]
         public DateTime? OligarchRejectDate { get; set; }
         [Comment("สถานะยับยั้งผู้บังคับบัญชา")]
         public bool? CommanderReject { get; set; }
+        [Comment("เหตุผลอนุมัติผู้บังคับบัญชา")]
+        public string? CommanderApproveReason { get; set; }
         [Comment("เหตุผลยับยั้งผู้บังคับบัญชา")]
         public string? CommanderRejectReason { get; set; }
         [Comment("วันที่ยับยั้งผู้บังคับบัญชา")]

BMA.EHR.Infrastructure/Migrations/20230829060253_update table resign add commander2.cs

@@ -0,0 +1,42 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class updatetableresignaddcommander2 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "CommanderApproveReason",
+                table: "RetirementResigns",
+                type: "longtext",
+                nullable: true,
+                comment: "เหตุผลอนุมัติผู้บังคับบัญชา")
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AddColumn<string>(
+                name: "OligarchApproveReason",
+                table: "RetirementResigns",
+                type: "longtext",
+                nullable: true,
+                comment: "เหตุผลอนุมัติผู้ดูแล")
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "CommanderApproveReason",
+                table: "RetirementResigns");
+
+            migrationBuilder.DropColumn(
+                name: "OligarchApproveReason",
+                table: "RetirementResigns");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/ApplicationDBContextModelSnapshot.cs

@@ -13569,6 +13569,10 @@ namespace BMA.EHR.Infrastructure.Migrations
                         .HasColumnType("longtext")
                         .HasComment("เหตุผลอนุมัติ");
 
+                    b.Property<string>("CommanderApproveReason")
+                        .HasColumnType("longtext")
+                        .HasComment("เหตุผลอนุมัติผู้บังคับบัญชา");
+
                     b.Property<bool?>("CommanderReject")
                         .HasColumnType("tinyint(1)")
                         .HasComment("สถานะยับยั้งผู้บังคับบัญชา");
@@ -13627,6 +13631,10 @@ namespace BMA.EHR.Infrastructure.Migrations
                         .HasColumnType("longtext")
                         .HasComment("สถานที่ยื่นขอลาออกราชการ");
 
+                    b.Property<string>("OligarchApproveReason")
+                        .HasColumnType("longtext")
+                        .HasComment("เหตุผลอนุมัติผู้ดูแล");
+
                     b.Property<bool?>("OligarchReject")
                         .HasColumnType("tinyint(1)")
                         .HasComment("สถานะยับยั้งผู้ดูแล");

BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs

@@ -215,9 +215,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
                             p.PositionNumberOld,
                             p.OrganizationPositionOld,
                             p.OligarchReject,
+                            p.OligarchApproveReason,
                             p.OligarchRejectReason,
                             p.OligarchRejectDate,
                             p.CommanderReject,
+                            p.CommanderApproveReason,
                             p.CommanderRejectReason,
                             p.CommanderRejectDate,
                             RetirementResignDocs = p.RetirementResignDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
@@ -259,9 +261,11 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 data.IsActive,
                 data.CreatedAt,
                 data.OligarchReject,
+                data.OligarchApproveReason,
                 data.OligarchRejectReason,
                 data.OligarchRejectDate,
                 data.CommanderReject,
+                data.CommanderApproveReason,
                 data.CommanderRejectReason,
                 data.CommanderRejectDate,
                 Docs = retirementResignDocs,
@@ -465,6 +469,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
 
             return Success();
         }
+
         /// <summary>
         /// ผู้บังคับบัญชา อนุมัติคำลาออก
         /// </summary>
@@ -475,7 +480,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpPut("commander/confirm/{id:length(36)}")]
-        public async Task<ActionResult<ResponseObject>> AdminConfirm([FromBody] RetirementReasonDateRequest req, Guid id)
+        public async Task<ActionResult<ResponseObject>> CommanderConfirm([FromBody] RetirementReasonRequest req, Guid id)
         {
             var updated = await _context.RetirementResigns
                             .FirstOrDefaultAsync(x => x.Id == id);
@@ -484,6 +489,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
 
             // updated.Status = "APPROVE";
             updated.CommanderReject = false;
+            updated.CommanderApproveReason = req.Reason;
             updated.LastUpdateFullName = FullName ?? "System Administrator";
             updated.LastUpdateUserId = UserId ?? "";
             updated.LastUpdatedAt = DateTime.Now;
@@ -502,7 +508,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpPut("commander/reject/{id:length(36)}")]
-        public async Task<ActionResult<ResponseObject>> AdminReject([FromBody] RetirementReasonDateRequest req, Guid id)
+        public async Task<ActionResult<ResponseObject>> CommanderReject([FromBody] RetirementReasonDateRequest req, Guid id)
         {
             var updated = await _context.RetirementResigns
                             .FirstOrDefaultAsync(x => x.Id == id);
@@ -530,15 +536,16 @@ namespace BMA.EHR.Retirement.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpPut("oligarch/confirm/{id:length(36)}")]
-        public async Task<ActionResult<ResponseObject>> AdminConfirm([FromBody] RetirementReasonDateRequest req, Guid id)
+        public async Task<ActionResult<ResponseObject>> OligarchConfirm([FromBody] RetirementReasonRequest req, Guid id)
         {
             var updated = await _context.RetirementResigns
                             .FirstOrDefaultAsync(x => x.Id == id);
             if (updated == null)
                 return Error(GlobalMessages.RetirementResignNotFound, 404);
 
-            // updated.Status = "APPROVE";
+            updated.Status = "APPROVE";
             updated.OligarchReject = false;
+            updated.OligarchApproveReason = req.Reason;
             updated.LastUpdateFullName = FullName ?? "System Administrator";
             updated.LastUpdateUserId = UserId ?? "";
             updated.LastUpdatedAt = DateTime.Now;
@@ -557,14 +564,14 @@ namespace BMA.EHR.Retirement.Service.Controllers
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
         [HttpPut("oligarch/reject/{id:length(36)}")]
-        public async Task<ActionResult<ResponseObject>> AdminReject([FromBody] RetirementReasonDateRequest req, Guid id)
+        public async Task<ActionResult<ResponseObject>> OligarchReject([FromBody] RetirementReasonDateRequest req, Guid id)
         {
             var updated = await _context.RetirementResigns
                             .FirstOrDefaultAsync(x => x.Id == id);
             if (updated == null)
                 return Error(GlobalMessages.RetirementResignNotFound, 404);
 
-            // updated.Status = "REJECT";
+            updated.Status = "REJECT";
             updated.OligarchReject = true;
             updated.OligarchRejectReason = req.Reason;
             updated.OligarchRejectDate = req.Date;