From 1e278f7e59542a9d77063867a5f807f789555373 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Thu, 12 Oct 2023 04:45:05 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20text=20=E0=B9=83?= =?UTF-8?q?=E0=B8=99=E0=B9=83=E0=B8=9A=E0=B8=AA=E0=B8=A1=E0=B8=B1=E0=B8=84?= =?UTF-8?q?=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Services/CandidateService.cs | 8 ++++---- Services/PeriodExamService.cs | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Services/CandidateService.cs b/Services/CandidateService.cs index a213d3f..a8b27ac 100644 --- a/Services/CandidateService.cs +++ b/Services/CandidateService.cs @@ -2049,7 +2049,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services else if (status == "payment" && candidate.PeriodExam.Fee == 0) { var subject = "แจ้งผลการสมัครสอบคัดเลือก " + candidate.PeriodExam.Name; - var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: รอเจ้าหน้าที่จัดที่นั่งสอบ"; + var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: ได้รับใบสมัครแล้ว"; if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email); candidate.Status = "checkSeat"; // var num = periodExam.Count() + 1; @@ -2064,7 +2064,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services if (candidate.Status == "checkSeat") { var subject = "แจ้งผลการสมัครสอบคัดเลือก " + candidate.PeriodExam.Name; - var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: รอเจ้าหน้าที่จัดที่นั่งสอบ"; + var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: ได้รับใบสมัครแล้ว"; if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email); // var num = periodExam.Count() + 1; // candidate.ExamIdenNumber = candidate.PositionExam == null ? num.ToString() : candidate.PositionExam.Code + num; @@ -2114,7 +2114,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services if (candidate.PeriodExam.Fee == 0) { var subject = "แจ้งผลการสมัครสอบคัดเลือก " + candidate.PeriodExam.Name; - var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: รอเจ้าหน้าที่จัดที่นั่งสอบ"; + var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: ได้รับใบสมัครแล้ว"; if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email); candidate.Status = "checkSeat"; if (candidate.ExamIdenNumber == null) @@ -2156,7 +2156,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services if (status == "checkPoint") { var subject = "แจ้งผลการสมัครสอบคัดเลือก " + candidate.PeriodExam.Name; - var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: รอเจ้าหน้าที่สรุปคะแนนสอบ"; + var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: ติดตามประกาศทาง Website"; if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email); } candidate.Status = status; diff --git a/Services/PeriodExamService.cs b/Services/PeriodExamService.cs index dae84dc..3761704 100644 --- a/Services/PeriodExamService.cs +++ b/Services/PeriodExamService.cs @@ -1000,7 +1000,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services { candidate.SeatNumber = item.SeatNumber; var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name; - var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: รอเจ้าหน้าที่สรุปคะแนนสอบ"; + var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: ติดตามประกาศทาง Website"; if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email); candidate.Status = "checkPoint"; } @@ -1122,7 +1122,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services candidates = await _context.Candidates .AsQueryable() .Include(x => x.PositionExam) - .OrderBy(x => x.ExamIdenNumber) + .OrderBy(x => x.PositionExam == null ? null : x.PositionExam.PositionName) + .ThenBy(x => x.PositionExam == null ? null : x.PositionExam.PositionLevelName) + .ThenBy(x => x.ExamIdenNumber) .Where(x => x.PeriodExam == periodExam) .Where(x => x.Status != "waiver") .Where(x => x.Status != "register") @@ -1133,7 +1135,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services candidates = await _context.Candidates .AsQueryable() .Include(x => x.PositionExam) - .OrderBy(x => x.ExamIdenNumber) + .OrderBy(x => x.PositionExam == null ? null : x.PositionExam.PositionName) + .ThenBy(x => x.PositionExam == null ? null : x.PositionExam.PositionLevelName) + .ThenBy(x => x.ExamIdenNumber) .Where(x => x.PeriodExam == periodExam) .Where(x => x.Status != "register") .ToListAsync();