From 0df7f2ebf35595eaf04f26fb8acd5a82a5cdd994 Mon Sep 17 00:00:00 2001
From: kittapath <kittapath@frappet.com>
Date: Fri, 1 Nov 2024 10:10:33 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=AA=E0=B8=96?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=B0=E0=B8=A2=E0=B8=81=E0=B9=80=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=81=E0=B8=A5=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PlacementOfficerController.cs              | 2 +-
 .../Controllers/RetirementResignController.cs              | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
index 810e46bd..fc8ee0cd 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
@@ -255,7 +255,7 @@ namespace BMA.EHR.Placement.Service.Controllers
         {
             var placementOfficers = await _context.PlacementOfficers.AsQueryable()
                         .OrderByDescending(x => x.CreatedAt)
-                            .Where(x => x.Status == "DONE")
+                        .Where(x => x.Status == "DONE")
                         .Where(x => x.profileId == id)
                         .Select(p => new
                         {
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
index 6e2d2009..03719510 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -227,7 +227,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
             var retirementResigns = await _context.RetirementResigns.AsQueryable()
-                            .Where(x => x.Status == type.Trim().ToUpper())
+                        .Where(x => x.Status == type.Trim().ToUpper())
                         .OrderByDescending(x => x.CreatedAt)
                         .Select(p => new
                         {
@@ -278,7 +278,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
             var retirementResigns = await _context.RetirementResignCancels.AsQueryable()
-                            .Where(x => x.Status == type.Trim().ToUpper())
+                        .Where(x => x.Status == type.Trim().ToUpper())
                         .OrderByDescending(x => x.CreatedAt)
                         .Select(p => new
                         {
@@ -1159,7 +1159,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
             updated.CancelReason = req.Reason;
             if (updated.Status == "DONE")
             {
-                // updated.Status = "CANCEL";
                 var retirementResignCancel = new RetirementResignCancel
                 {
                     Location = updated.Location,
@@ -1620,7 +1619,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 return Error(GlobalMessages.RetirementResignNotFound, 404);
             if ((DateTime.Now - updated.CreatedAt).TotalDays >= 90)
                 return Error("สามารถยับยั้งได้ไม่เกิน 90 วัน");
-            updated.Status = "REJECT";
+            updated.Status = "APPROVE";
             updated.OligarchReject = true;
             updated.OligarchRejectReason = req.Reason;
             updated.OligarchRejectDate = req.Date;