From 6a2fda2a62c8aaf64acfee6d750039a6a7fda9c0 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Sun, 14 May 2023 18:50:36 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=AD=E0=B8=B1=E0=B8=9E=E0=B8=84=E0=B8=B0?= =?UTF-8?q?=E0=B9=81=E0=B8=99=E0=B8=99=E0=B8=AA=E0=B8=AD=E0=B8=9A=E0=B9=84?= =?UTF-8?q?=E0=B8=A1=E0=B9=88=E0=B9=80=E0=B8=9B=E0=B8=A5=E0=B8=B5=E0=B9=88?= =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=AA=E0=B8=96=E0=B8=B2=E0=B8=99=E0=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Services/PeriodExamService.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Services/PeriodExamService.cs b/Services/PeriodExamService.cs index 9adcc57..18a24a7 100644 --- a/Services/PeriodExamService.cs +++ b/Services/PeriodExamService.cs @@ -658,7 +658,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services .Where(x => x.PeriodExam == periodExam && x.Status != "register" && x.Status != "rejectRegister") .ToListAsync(); if (candidate.Where(x => x.Status == "done").FirstOrDefault() != null) - candidate = candidate.OrderBy(x => x.Number).ToList(); + candidate = candidate.OrderBy(x => Convert.ToInt32(x.Number)).ToList(); var i = 0; foreach (var item in candidate) { @@ -676,7 +676,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services .Where(x => x.PeriodExam == periodExam && x.Status == status) .ToListAsync(); if (candidate.Where(x => x.Status == "done").FirstOrDefault() != null) - candidate = candidate.OrderBy(x => x.Number).ToList(); + candidate = candidate.OrderBy(x => Convert.ToInt32(x.Number)).ToList(); var i = 0; foreach (var item in candidate) { @@ -990,7 +990,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services candidate.Number = item.Number; var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name; var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สอบคัดเลือกสำเร็จ"; - if (candidate.Email != null) _mailService.SendMailToUser(subject, body, candidate.Email); + // if (candidate.Email != null) _mailService.SendMailToUser(subject, body, candidate.Email); candidate.Status = "done"; } else @@ -999,9 +999,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services { var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name; var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สละสิทธิ์สอบ"; - if (candidate.Email != null) _mailService.SendMailToUser(subject, body, candidate.Email); + // if (candidate.Email != null) _mailService.SendMailToUser(subject, body, candidate.Email); } - candidate.Status = "waiver"; + // candidate.Status = "waiver"; } } else @@ -1010,9 +1010,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services { var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name; var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สละสิทธิ์สอบ"; - if (candidate.Email != null) _mailService.SendMailToUser(subject, body, candidate.Email); + // if (candidate.Email != null) _mailService.SendMailToUser(subject, body, candidate.Email); } - candidate.Status = "waiver"; + // candidate.Status = "waiver"; } periodExam.SetSeat = true; } @@ -1139,7 +1139,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services { Id = 3, Name = "จำนวนผู้เข้ารับการคัดเลือกทั้งหมด", - Count = periodExam.Candidate.Where(x=>x.PaymentImg!=null).Count() + Count = periodExam.Candidate.Where(x=>x.SeatNumber != null).Count() }, new DashboardResponseItem {