From 7b7dbb7475af52c64eaad75b73292e3c179b2c97 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Wed, 12 Apr 2023 14:09:50 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B8=84=E0=B9=88?= =?UTF-8?q?=E0=B8=B2=20category=20=E0=B8=AA=E0=B8=A1=E0=B8=B1=E0=B8=84?= =?UTF-8?q?=E0=B8=A3=E0=B8=AA=E0=B8=AD=E0=B8=9A=E0=B8=84=E0=B8=B1=E0=B8=94?= =?UTF-8?q?=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B8=AD=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Response/CMSExamResponseItem.cs | 6 +++--- Services/CMSCandidateService.cs | 21 +++++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Response/CMSExamResponseItem.cs b/Response/CMSExamResponseItem.cs index 80f4f91..7f0bdde 100644 --- a/Response/CMSExamResponseItem.cs +++ b/Response/CMSExamResponseItem.cs @@ -7,11 +7,11 @@ namespace BMA.EHR.Recurit.Exam.Service.Response { public string? Id { get; set; } public string? Category { get; set; } - public string? Category_id { get; set; } + public string? CategoryId { get; set; } public string? Start { get; set; } public string? End { get; set; } - public string? Exam_date { get; set; } - public string? Announcement_date { get; set; } + public string? ExamDate { get; set; } + public string? Announcement_startDate { get; set; } public string? Announcement_endDate { get; set; } public bool? AnnouncementExam { get; set; } public string? Register_startDate { get; set; } diff --git a/Services/CMSCandidateService.cs b/Services/CMSCandidateService.cs index aa40dd1..01b686f 100644 --- a/Services/CMSCandidateService.cs +++ b/Services/CMSCandidateService.cs @@ -60,7 +60,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services #region " Methods " - public string GetNameCategory(string? category) + static public string GetNameCategory(string? category) { if (category == null) return "-"; @@ -78,6 +78,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services return "-"; } } + public async Task GetsAsync() { var cms = await createCMS(); @@ -360,11 +361,11 @@ namespace BMA.EHR.Recurit.Exam.Service.Services { Id = x.Id.ToString(), Category = GetNameCategory(x.Category), - Category_id = x.Category, + CategoryId = x.Category, Start = x.ExamDate.ToString("yyyy-MM-dd"), End = x.ExamDate.ToString("yyyy-MM-dd"), - Exam_date = x.ExamDate.ToString("yyyy-MM-dd"), - Announcement_date = x.AnnouncementStartDate.ToString("yyyy-MM-dd"), + ExamDate = x.ExamDate.ToString("yyyy-MM-dd"), + Announcement_startDate = x.AnnouncementStartDate.ToString("yyyy-MM-dd"), Announcement_endDate = x.AnnouncementEndDate.ToString("yyyy-MM-dd"), AnnouncementExam = x.AnnouncementExam, Register_startDate = x.RegisterStartDate.ToString("yyyy-MM-dd"), @@ -404,11 +405,11 @@ namespace BMA.EHR.Recurit.Exam.Service.Services { Id = x.Id.ToString(), Category = GetNameCategory(x.Category), - Category_id = x.Category, + CategoryId = x.Category, Start = x.ExamDate.ToString("yyyy-MM-dd"), End = x.ExamDate.ToString("yyyy-MM-dd"), - Exam_date = x.ExamDate.ToString("yyyy-MM-dd"), - Announcement_date = x.AnnouncementStartDate.ToString("yyyy-MM-dd"), + ExamDate = x.ExamDate.ToString("yyyy-MM-dd"), + Announcement_startDate = x.AnnouncementStartDate.ToString("yyyy-MM-dd"), Announcement_endDate = x.AnnouncementEndDate.ToString("yyyy-MM-dd"), AnnouncementExam = x.AnnouncementExam, Register_startDate = x.RegisterStartDate.ToString("yyyy-MM-dd"), @@ -448,11 +449,11 @@ namespace BMA.EHR.Recurit.Exam.Service.Services { Id = x.Id.ToString(), Category = GetNameCategory(x.Category), - Category_id = x.Category, + CategoryId = x.Category, Start = x.AnnouncementStartDate.ToString("yyyy-MM-dd"), End = x.AnnouncementEndDate.ToString("yyyy-MM-dd"), - Exam_date = x.ExamDate.ToString("yyyy-MM-dd"), - Announcement_date = x.AnnouncementStartDate.ToString("yyyy-MM-dd"), + ExamDate = x.ExamDate.ToString("yyyy-MM-dd"), + Announcement_startDate = x.AnnouncementStartDate.ToString("yyyy-MM-dd"), Announcement_endDate = x.AnnouncementEndDate.ToString("yyyy-MM-dd"), AnnouncementExam = x.AnnouncementExam, Register_startDate = x.RegisterStartDate.ToString("yyyy-MM-dd"),