From 59edf6a716dccc9a705afa698a210da37a6daa4d Mon Sep 17 00:00:00 2001 From: Bright Date: Thu, 30 Jan 2025 15:07:46 +0700 Subject: [PATCH] =?UTF-8?q?api=20get=20=E0=B8=A3=E0=B8=B2=E0=B8=A2?= =?UTF-8?q?=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=9C=E0=B8=B9=E0=B9=89?= =?UTF-8?q?=E0=B9=80=E0=B8=81=E0=B8=A9=E0=B8=B5=E0=B8=A2=E0=B8=93=E0=B8=AD?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=B8=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repositories/RetirementRepository.cs | 74 ++++++++++--------- .../Controllers/RetirementController.cs | 62 +++++++--------- BMA.EHR.Retirement.Service/Program.cs | 3 +- 3 files changed, 67 insertions(+), 72 deletions(-) diff --git a/BMA.EHR.Application/Repositories/RetirementRepository.cs b/BMA.EHR.Application/Repositories/RetirementRepository.cs index ac0b27a0..a771b89e 100644 --- a/BMA.EHR.Application/Repositories/RetirementRepository.cs +++ b/BMA.EHR.Application/Repositories/RetirementRepository.cs @@ -105,43 +105,49 @@ namespace BMA.EHR.Application.Repositories } //เกษียณอายุราชการ - public async Task ExecuteRetirement() - { - var retirePeriodOfficer = await _dbContext.Set() - .Include(x => x.RetirementRawProfiles.Where(y => y.Remove != "REMOVE")) - .Where(x => x.Year == /*DateTime.Now.Year*/2026) - .Where(x => x.Type.Trim().ToUpper().Contains("OFFICER")) - .FirstOrDefaultAsync(); + //public async Task ExecuteRetirement() + //{ + // var retirePeriodOfficer = await _dbContext.Set() + // .Include(x => x.RetirementRawProfiles.Where(y => y.Remove != "REMOVE")) + // .Where(x => x.Year == DateTime.Now.Year) + // .Where(x => x.Type.Trim().ToUpper().Contains("OFFICER")) + // .FirstOrDefaultAsync(); - var body = retirePeriodOfficer.RetirementProfiles - .Select(x => new { - profileId = x.profileId, - //lastUpdateUserId = UserId, - //lastUpdateFullName = FullName, - }) - .ToList(); + // if (retirePeriodOfficer == null) + // return; - //ข้าราชการ - //var apiUrl = $"{_configuration["API"]}/org/unauthorize/retirement"; - var apiUrl = $"http://localhost:13001/api/v1/org/unauthorize/retirement"; - using (var client = new HttpClient()) - { - client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); - client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]); - var jsonBody = JsonConvert.SerializeObject(body); - var content = new StringContent(jsonBody, Encoding.UTF8, "application/json"); - var _req = new HttpRequestMessage(HttpMethod.Patch, apiUrl) - { - Content = content - }; - var response = await client.SendAsync(_req); - var responseContent = await response.Content.ReadAsStringAsync(); - if (!response.IsSuccessStatusCode) - { + // var body = new + // { + // data = retirePeriodOfficer.RetirementRawProfiles + // .Select(x => new + // { + // profileId = x.profileId + // }) + // .ToList() + // }; - } - } - } + // //ข้าราชการ + // //var apiUrl = $"{_configuration["API"]}/org/unauthorize/retirement"; + // using (var client = new HttpClient()) + // { + // client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); + // client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]); + + // var jsonBody = JsonConvert.SerializeObject(body); + // var content = new StringContent(jsonBody, Encoding.UTF8, "application/json"); + + // var _req = new HttpRequestMessage(HttpMethod.Patch, apiUrl) + // { + // Content = content + // }; + // var response = await client.SendAsync(_req); + // var responseContent = await response.Content.ReadAsStringAsync(); + // if (!response.IsSuccessStatusCode) + // { + + // } + // } + //} public void TestMethod() { diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs index 5d5b5306..4336ee79 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs @@ -1999,44 +1999,34 @@ namespace BMA.EHR.Retirement.Service.Controllers return Success(data); } - //เกษียณอายุราชการ - //public async Task ExecuteRetirement() - //{ - // var retirePeriodOfficer = await _context.RetirementPeriods - // .Include(x => x.RetirementRawProfiles.Where(y => y.Remove != "REMOVE")) - // .Where(x => x.Year == /*DateTime.Now.Year*/2026) - // .Where(x => x.Type.Trim().ToUpper().Contains("OFFICER")) - // .FirstOrDefaultAsync(); + /// + /// เกษียณอายุราชการ + /// + /// ประเภทUser(officer,employee)(ตัวใหญ่หรือเล็กก็ได้) + /// ปีงบประมาณ(ค.ศ.) + /// + /// + /// ค่าตัวแปรที่ส่งมาไม่ถูกต้อง + /// ไม่ได้ Login เข้าระบบ + /// เมื่อเกิดข้อผิดพลาดในการทำงาน + [HttpGet("update-status/{type}/{year}")] + public async Task> UpdateStatusRetirement(string type, int year) + { + var retirePeriodOfficer = await _context.RetirementPeriods + .Include(x => x.RetirementRawProfiles.Where(y => y.Remove != "REMOVE")) + .Where(x => x.Year == year && x.Type.Trim().ToUpper().Contains(type)) + .FirstOrDefaultAsync(); - // var body = retirePeriodOfficer.RetirementProfiles - // .Select(x => new - // { - // profileId = x.profileId, - // //lastUpdateUserId = UserId, - // //lastUpdateFullName = FullName, - // }) - // .ToList(); + if (retirePeriodOfficer == null) + return Error("ไม่พบรอบประกาศเกษียณอายุราชการ"); - // //ข้าราชการ - // //var apiUrl = $"{_configuration["API"]}/org/unauthorize/retirement"; - // var apiUrl = $"http://localhost:13001/api/v1/org/unauthorize/retirement"; - // using (var client = new HttpClient()) - // { - // client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); - // client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]); - // var jsonBody = JsonConvert.SerializeObject(body); - // var content = new StringContent(jsonBody, Encoding.UTF8, "application/json"); - // var _req = new HttpRequestMessage(HttpMethod.Patch, apiUrl) - // { - // Content = content - // }; - // var response = await client.SendAsync(_req); - // var responseContent = await response.Content.ReadAsStringAsync(); - // if (!response.IsSuccessStatusCode) - // { + var data = retirePeriodOfficer.RetirementRawProfiles + .Select(x => new { + profileId = x.profileId + }) + .ToList(); - // } - // } - //} + return Success(data); + } } } diff --git a/BMA.EHR.Retirement.Service/Program.cs b/BMA.EHR.Retirement.Service/Program.cs index 31c7ad92..fc121e82 100644 --- a/BMA.EHR.Retirement.Service/Program.cs +++ b/BMA.EHR.Retirement.Service/Program.cs @@ -173,9 +173,8 @@ var app = builder.Build(); //manager.AddOrUpdate("แจ้งเตือนระบบปลดออก", Job.FromExpression(x => x.NotifyDischarge()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local); //manager.AddOrUpdate("แจ้งเตือนระบบไล่ออก", Job.FromExpression(x => x.NotifyExpulsion()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local); //manager.AddOrUpdate("แจ้งเตือนระบบให้ออก", Job.FromExpression(x => x.NotifyOut()), Cron.Daily(Int32.Parse(builder.Configuration["KeycloakCron:Hour"]), Int32.Parse(builder.Configuration["KeycloakCron:Minute"])), TimeZoneInfo.Local); - manager.AddOrUpdate("อัพเดทสถานะเกษียณอายุราชการ", Job.FromExpression(x => x.ExecuteRetirement()), Cron.Yearly(10, 1, 0, 0), TimeZoneInfo.Local); + //manager.AddOrUpdate("อัพเดทสถานะเกษียณอายุราชการ", Job.FromExpression(x => x.ExecuteRetirement()), Cron.Yearly(10, 1, 0, 0), TimeZoneInfo.Local); manager.AddOrUpdate("ทดสอบ", Job.FromExpression(x => x.TestMethod()), Cron.Yearly(10, 1, 0, 0), TimeZoneInfo.Local); - //manager.AddOrUpdate("Test อัพเดทสถานะเกษียณอายุราชการ", Job.FromExpression(x => x.ExecuteRetirement()), Cron.Yearly(10, 1, 0, 0), TimeZoneInfo.Local); } // apply migrations