From e8cf09b7ac2e47bb91470aeb15d4f80b98c1ed16 Mon Sep 17 00:00:00 2001 From: Bright Date: Tue, 17 Sep 2024 13:49:48 +0700 Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=AA=E0=B8=B4=E0=B8=97=E0=B8=98?= =?UTF-8?q?=E0=B8=B4=E0=B9=8C=20api=20list=20=E0=B8=84=E0=B8=B3=E0=B8=96?= =?UTF-8?q?=E0=B8=B2=E0=B8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/RetirementResignController.cs | 72 +++++++++++++++++-- 1 file changed, 65 insertions(+), 7 deletions(-) diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 774a529f..5013adeb 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -1453,7 +1453,7 @@ $"คำขอลาออกของ {updated.prefix}{updated.firstName} {upda } /// - /// list คำถาม + /// list คำถาม (USER) /// /// /// @@ -1463,12 +1463,12 @@ $"คำขอลาออกของ {updated.prefix}{updated.firstName} {upda [HttpGet("questionnaire/question")] public async Task> GetQuestionnaireQuestion() { - var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_RESIGN_INTERVIEW"); - var jsonData = JsonConvert.DeserializeObject(getPermission); - if (jsonData["status"]?.ToString() != "200") - { - return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); - } + //var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_RESIGN_INTERVIEW"); + //var jsonData = JsonConvert.DeserializeObject(getPermission); + //if (jsonData["status"]?.ToString() != "200") + //{ + // return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); + //} var retirementQuestionnaireQuestion = await _context.RetirementQuestionnaireQuestions.AsQueryable() .Select(x => new { @@ -1570,5 +1570,63 @@ $"คำขอลาออกของ {updated.prefix}{updated.firstName} {upda return Success(); } + + /// + /// list คำถาม (ADMIN) + /// + /// + /// + /// ค่าตัวแปรที่ส่งมาไม่ถูกต้อง + /// ไม่ได้ Login เข้าระบบ + /// เมื่อเกิดข้อผิดพลาดในการทำงาน + [HttpGet("questionnaire/question/admin")] + public async Task> GetQuestionnaireQuestionAdmin() + { + var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_RESIGN_INTERVIEW"); + var jsonData = JsonConvert.DeserializeObject(getPermission); + if (jsonData["status"]?.ToString() != "200") + { + return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); + } + var retirementQuestionnaireQuestion = await _context.RetirementQuestionnaireQuestions.AsQueryable() + .Select(x => new + { + Question1Desc = x.Question1Desc, + Question1Score = x.Question1Score, + Question1Answer = x.Question1Answer == null ? null : JsonConvert.DeserializeObject>(x.Question1Answer), + Question2Desc = x.Question2Desc, + Question2Score = x.Question2Score, + Question2Answer = x.Question2Answer == null ? null : JsonConvert.DeserializeObject>(x.Question2Answer), + Question3Desc = x.Question3Desc, + Question3Score = x.Question3Score, + Question3Answer = x.Question3Answer == null ? null : JsonConvert.DeserializeObject>(x.Question3Answer), + Question4Desc = x.Question4Desc, + Question4Score = x.Question4Score, + Question4Answer = x.Question4Answer == null ? null : JsonConvert.DeserializeObject>(x.Question4Answer), + Question5Desc = x.Question5Desc, + Question5Score = x.Question5Score, + Question5Answer = x.Question5Answer == null ? null : JsonConvert.DeserializeObject>(x.Question5Answer), + Question6Desc = x.Question6Desc, + Question6Score = x.Question6Score, + Question6Answer = x.Question6Answer == null ? null : JsonConvert.DeserializeObject>(x.Question6Answer), + Question7Desc = x.Question7Desc, + Question7Score = x.Question7Score, + Question7Answer = x.Question7Answer == null ? null : JsonConvert.DeserializeObject>(x.Question7Answer), + Question8Desc = x.Question8Desc, + Question8Score = x.Question8Score, + Question8Answer = x.Question8Answer == null ? null : JsonConvert.DeserializeObject>(x.Question8Answer), + Question9Desc = x.Question9Desc, + Question9Score = x.Question9Score, + Question9Answer = x.Question9Answer == null ? null : JsonConvert.DeserializeObject>(x.Question9Answer), + Question10Desc = x.Question10Desc, + Question10Score = x.Question10Score, + Question10Answer = x.Question10Answer == null ? null : JsonConvert.DeserializeObject>(x.Question10Answer), + }) + .FirstOrDefaultAsync(); + if (retirementQuestionnaireQuestion == null) + return Error(GlobalMessages.RetirementQuestionNotFound); + + return Success(retirementQuestionnaireQuestion); + } } }