From 3bb786478943b0c91e939975e9882a1d2c06fabf Mon Sep 17 00:00:00 2001 From: kittapath-Jool Date: Mon, 15 Sep 2025 16:03:21 +0700 Subject: [PATCH] add authname --- Controllers/ExamReportController.cs | 42 +++++++++++++------------- Controllers/RecruitReportController.cs | 42 +++++++++++++------------- Models/Exam/Disable/Disable.cs | 4 +-- Models/Exam/PeriodExam.cs | 2 ++ Models/Recruits/Recruit.cs | 4 +-- Models/Recruits/RecruitImport.cs | 26 ++++++++-------- 6 files changed, 62 insertions(+), 58 deletions(-) diff --git a/Controllers/ExamReportController.cs b/Controllers/ExamReportController.cs index a2c8c66..fd8b6e9 100644 --- a/Controllers/ExamReportController.cs +++ b/Controllers/ExamReportController.cs @@ -122,25 +122,25 @@ namespace BMA.EHR.Report.Service.Controllers if (_data == null) return Error("ไม่พบข้อมูลในระบบ"); - if (_data.AuthName == null || _data.AuthName == "") - { - var apiUrl = $"{_configuration["API"]}/org/find/head/officer"; - using (var client = new HttpClient()) - { - client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); - client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]); - var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl); - var _res = await client.SendAsync(_req); - var _result = await _res.Content.ReadAsStringAsync(); - if (_res.IsSuccessStatusCode) - { - var org = JsonConvert.DeserializeObject(_result); - _data.AuthName = org.result.name == null ? "" : org.result.name; - _data.AuthPosition = org.result.position == null ? "" : org.result.position; - await _context.SaveChangesAsync(); - } - } - } + // if (_data.AuthName == null || _data.AuthName == "") + // { + // var apiUrl = $"{_configuration["API"]}/org/find/head/officer"; + // using (var client = new HttpClient()) + // { + // client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); + // client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]); + // var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl); + // var _res = await client.SendAsync(_req); + // var _result = await _res.Content.ReadAsStringAsync(); + // if (_res.IsSuccessStatusCode) + // { + // var org = JsonConvert.DeserializeObject(_result); + // _data.AuthName = org.result.name == null ? "" : org.result.name; + // _data.AuthPosition = org.result.position == null ? "" : org.result.position; + // await _context.SaveChangesAsync(); + // } + // } + // } var data = await _context.Disables.AsQueryable() .Include(x => x.PeriodExam) @@ -159,8 +159,8 @@ namespace BMA.EHR.Report.Service.Controllers FullName = $"{p.Prefix}{p.FirstName} {p.LastName}", ExamResult = sr == null ? "" : sr.ExamStatus, EndDate = p.PeriodExam.RegisterEndDate == null ? "" : (p.PeriodExam.RegisterEndDate.Value.ToThaiFullDate3()), - AuthName = p.AuthName, - AuthPosition = p.AuthPosition + AuthName = p.PeriodExam.AuthName, + AuthPosition = p.PeriodExam.AuthPosition }) .FirstOrDefaultAsync(); diff --git a/Controllers/RecruitReportController.cs b/Controllers/RecruitReportController.cs index abff95f..6145db3 100644 --- a/Controllers/RecruitReportController.cs +++ b/Controllers/RecruitReportController.cs @@ -83,25 +83,25 @@ namespace BMA.EHR.Report.Service.Controllers if (_data == null) return Error("ไม่พบข้อมูลในระบบ"); - if (_data.AuthName == null || _data.AuthName == "") - { - var apiUrl = $"{_configuration["API"]}/org/find/head/officer"; - using (var client = new HttpClient()) - { - client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); - client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]); - var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl); - var _res = await client.SendAsync(_req); - var _result = await _res.Content.ReadAsStringAsync(); - if (_res.IsSuccessStatusCode) - { - var org = JsonConvert.DeserializeObject(_result); - _data.AuthName = org.result.name == null ? "" : org.result.name; - _data.AuthPosition = org.result.position == null ? "" : org.result.position; - await _context.SaveChangesAsync(); - } - } - } + // if (_data.AuthName == null || _data.AuthName == "") + // { + // var apiUrl = $"{_configuration["API"]}/org/find/head/officer"; + // using (var client = new HttpClient()) + // { + // client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); + // client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]); + // var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl); + // var _res = await client.SendAsync(_req); + // var _result = await _res.Content.ReadAsStringAsync(); + // if (_res.IsSuccessStatusCode) + // { + // var org = JsonConvert.DeserializeObject(_result); + // _data.AuthName = org.result.name == null ? "" : org.result.name; + // _data.AuthPosition = org.result.position == null ? "" : org.result.position; + // await _context.SaveChangesAsync(); + // } + // } + // } var data = await _context.Recruits.AsQueryable() .Include(x => x.RecruitImport) @@ -120,8 +120,8 @@ namespace BMA.EHR.Report.Service.Controllers FullName = $"{p.Prefix}{p.FirstName} {p.LastName}", ExamResult = sr == null ? "" : sr.ExamStatus, EndDate = p.RecruitImport.RegisterEndDate == null ? "-" : p.RecruitImport.RegisterEndDate.Value.ToThaiFullDate3(), - AuthName = p.AuthName, - AuthPosition = p.AuthPosition + AuthName = p.RecruitImport.AuthName, + AuthPosition = p.RecruitImport.AuthPosition }) .FirstOrDefaultAsync(); if (data == null) diff --git a/Models/Exam/Disable/Disable.cs b/Models/Exam/Disable/Disable.cs index a5bebcb..b7c1ab9 100644 --- a/Models/Exam/Disable/Disable.cs +++ b/Models/Exam/Disable/Disable.cs @@ -80,8 +80,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Models.Disables public string? PositionName { get; set; } public string? PositionType { get; set; } public string? PositionLevel { get; set; } - public string? AuthName { get; set; } - public string? AuthPosition { get; set; } + // public string? AuthName { get; set; } + // public string? AuthPosition { get; set; } [Comment("บัญชีสอบ")] public string? HddPosition { get; set; } = string.Empty; diff --git a/Models/Exam/PeriodExam.cs b/Models/Exam/PeriodExam.cs index 4167b10..1caceb7 100644 --- a/Models/Exam/PeriodExam.cs +++ b/Models/Exam/PeriodExam.cs @@ -88,6 +88,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Models [Comment("สำนัก")] public string? Category { get; set; } + public string? AuthName { get; set; } + public string? AuthPosition { get; set; } [Comment("รายชื่อคนสม้ครในรอบ")] public List Candidate { get; set; } = new List(); diff --git a/Models/Recruits/Recruit.cs b/Models/Recruits/Recruit.cs index df91824..8b94c4b 100644 --- a/Models/Recruits/Recruit.cs +++ b/Models/Recruits/Recruit.cs @@ -80,8 +80,8 @@ namespace BMA.EHR.Recruit.Service.Models.Recruits public string? PositionName { get; set; } public string? PositionType { get; set; } public string? PositionLevel { get; set; } - public string? AuthName { get; set; } - public string? AuthPosition { get; set; } + // public string? AuthName { get; set; } + // public string? AuthPosition { get; set; } [Comment("บัญชีสอบ")] public string? HddPosition { get; set; } = string.Empty; diff --git a/Models/Recruits/RecruitImport.cs b/Models/Recruits/RecruitImport.cs index 9ea0f41..0163ece 100644 --- a/Models/Recruits/RecruitImport.cs +++ b/Models/Recruits/RecruitImport.cs @@ -6,16 +6,16 @@ using BMA.EHR.Report.Service.Models; namespace BMA.EHR.Recruit.Service.Models.Recruits { - public class RecruitImport : EntityBase - { - [Required, Comment("ปีที่จัดการสอบ"), Column(Order = 1)] - public int Year { get; set; } + public class RecruitImport : EntityBase + { + [Required, Comment("ปีที่จัดการสอบ"), Column(Order = 1)] + public int Year { get; set; } - [Required, MaxLength(250), Comment("ชื่อการสอบ"), Column(Order = 2)] - public string Name { get; set; } = string.Empty; + [Required, MaxLength(250), Comment("ชื่อการสอบ"), Column(Order = 2)] + public string Name { get; set; } = string.Empty; - [Required, Comment("ครั้งที่"), Column(Order = 3)] - public int Order { get; set; } = 1; + [Required, Comment("ครั้งที่"), Column(Order = 3)] + public int Order { get; set; } = 1; [Column(Order = 4, TypeName = "text"), Comment("รายละเอียด")] public string? Detail { get; set; } @@ -46,15 +46,17 @@ namespace BMA.EHR.Recruit.Service.Models.Recruits [Column(Order = 13, TypeName = "text"), Comment("หมายเหตุ")] public string? Note { get; set; } + public string? AuthName { get; set; } + public string? AuthPosition { get; set; } public DateTime? AnnouncementDate { get; set; } public Document ImportFile { get; set; } = new Document(); - public List Recruits { get; set; } = new List(); + public List Recruits { get; set; } = new List(); - public ScoreImport ScoreImport { get; set; } + public ScoreImport ScoreImport { get; set; } - public List ImportHostories { get; set; } = new List(); - } + public List ImportHostories { get; set; } = new List(); + } }