hrms-bangkok/hrms-api-exam
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix #1934

Browse source
This commit is contained in:
harid 2025-11-05 17:02:41 +07:00
parent ee9e233e99
commit 33e8d487ef
2 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Controllers/DisableController.cs
View file

@ -2122,7 +2122,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
// --------------------------- // ---------------------------
dynamic header = null; dynamic header = null;
int _count = await _context.Disables.Where(x => x.PeriodExam.Id == id).CountAsync(); int _count = await _context.Disables.Where(x => x.PeriodExam.Id == id).CountAsync();
if (data.Count > 0) if (_count > 0)
{ {
header = await _context.DisableScores header = await _context.DisableScores
.Include(x => x.ScoreImport) .Include(x => x.ScoreImport)

48
Services/PeriodExamService.cs
View file

@ -763,12 +763,14 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
.OrderByDescending(d => d.CreatedAt) .OrderByDescending(d => d.CreatedAt)
.Where(x => x.PeriodExam == periodExam && x.RegisterDate != null && x.Status != "register" && x.Status != "rejectRegister") .Where(x => x.PeriodExam == periodExam && x.RegisterDate != null && x.Status != "register" && x.Status != "rejectRegister")
.Where(x => .Where(x =>
(x.PositionExam == null || x.PositionExam.PositionLevelName == null ? false : x.PositionExam.PositionLevelName.Contains(keyword)) || //(x.PositionExam == null || x.PositionExam.PositionLevelName == null ? false : x.PositionExam.PositionLevelName.Contains(keyword)) ||
(x.PositionExam == null || x.PositionExam.PositionName == null ? false : x.PositionExam.PositionName.Contains(keyword)) || //(x.PositionExam == null || x.PositionExam.PositionName == null ? false : x.PositionExam.PositionName.Contains(keyword)) ||
(x.PositionExam.PositionName + x.PositionExam.PositionLevelName).Contains(keyword) ||
(x.CitizenId == null ? false : x.CitizenId.Contains(keyword)) || (x.CitizenId == null ? false : x.CitizenId.Contains(keyword)) ||
(x.PrefixName == null ? false : x.PrefixName.Contains(keyword)) || //(x.PrefixName == null ? false : x.PrefixName.Contains(keyword)) ||
(x.FirstName == null ? false : x.FirstName.Contains(keyword)) || //(x.FirstName == null ? false : x.FirstName.Contains(keyword)) ||
(x.LastName == null ? false : x.LastName.Contains(keyword)) || //(x.LastName == null ? false : x.LastName.Contains(keyword)) ||
(x.PrefixName + x.FirstName + " " + x.LastName).Contains(keyword) ||
(x.ExamIdenNumber == null ? false : x.ExamIdenNumber.Contains(keyword)) || (x.ExamIdenNumber == null ? false : x.ExamIdenNumber.Contains(keyword)) ||
(x.SeatNumber == null ? false : x.SeatNumber.Contains(keyword)) || (x.SeatNumber == null ? false : x.SeatNumber.Contains(keyword)) ||
(x.ResultA == null ? false : x.ResultA.Contains(keyword)) || (x.ResultA == null ? false : x.ResultA.Contains(keyword)) ||
@ -804,12 +806,14 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
var _candidate = await _context.Candidates.AsQueryable() var _candidate = await _context.Candidates.AsQueryable()
.Where(x => x.PeriodExam == periodExam && x.RegisterDate != null && x.Status != "register" && x.Status != "rejectRegister") .Where(x => x.PeriodExam == periodExam && x.RegisterDate != null && x.Status != "register" && x.Status != "rejectRegister")
.Where(x => .Where(x =>
(x.PositionExam == null || x.PositionExam.PositionLevelName == null ? false : x.PositionExam.PositionLevelName.Contains(keyword)) || //(x.PositionExam == null || x.PositionExam.PositionLevelName == null ? false : x.PositionExam.PositionLevelName.Contains(keyword)) ||
(x.PositionExam == null || x.PositionExam.PositionName == null ? false : x.PositionExam.PositionName.Contains(keyword)) || //(x.PositionExam == null || x.PositionExam.PositionName == null ? false : x.PositionExam.PositionName.Contains(keyword)) ||
(x.PositionExam.PositionName + x.PositionExam.PositionLevelName).Contains(keyword) ||
(x.CitizenId == null ? false : x.CitizenId.Contains(keyword)) || (x.CitizenId == null ? false : x.CitizenId.Contains(keyword)) ||
(x.PrefixName == null ? false : x.PrefixName.Contains(keyword)) || //(x.PrefixName == null ? false : x.PrefixName.Contains(keyword)) ||
(x.FirstName == null ? false : x.FirstName.Contains(keyword)) || //(x.FirstName == null ? false : x.FirstName.Contains(keyword)) ||
(x.LastName == null ? false : x.LastName.Contains(keyword)) || //(x.LastName == null ? false : x.LastName.Contains(keyword)) ||
(x.PrefixName + x.FirstName + " " + x.LastName).Contains(keyword) ||
(x.ExamIdenNumber == null ? false : x.ExamIdenNumber.Contains(keyword)) || (x.ExamIdenNumber == null ? false : x.ExamIdenNumber.Contains(keyword)) ||
(x.SeatNumber == null ? false : x.SeatNumber.Contains(keyword)) || (x.SeatNumber == null ? false : x.SeatNumber.Contains(keyword)) ||
(x.ResultA == null ? false : x.ResultA.Contains(keyword)) || (x.ResultA == null ? false : x.ResultA.Contains(keyword)) ||
@ -838,12 +842,14 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
.OrderByDescending(d => d.CreatedAt) .OrderByDescending(d => d.CreatedAt)
.Where(x => x.PeriodExam == periodExam && x.Status == status) .Where(x => x.PeriodExam == periodExam && x.Status == status)
.Where(x => .Where(x =>
(x.PositionExam == null || x.PositionExam.PositionLevelName == null ? false : x.PositionExam.PositionLevelName.Contains(keyword)) || //(x.PositionExam == null || x.PositionExam.PositionLevelName == null ? false : x.PositionExam.PositionLevelName.Contains(keyword)) ||
(x.PositionExam == null || x.PositionExam.PositionName == null ? false : x.PositionExam.PositionName.Contains(keyword)) || //(x.PositionExam == null || x.PositionExam.PositionName == null ? false : x.PositionExam.PositionName.Contains(keyword)) ||
(x.PositionExam.PositionName + x.PositionExam.PositionLevelName).Contains(keyword) ||
(x.CitizenId == null ? false : x.CitizenId.Contains(keyword)) || (x.CitizenId == null ? false : x.CitizenId.Contains(keyword)) ||
(x.PrefixName == null ? false : x.PrefixName.Contains(keyword)) || //(x.PrefixName == null ? false : x.PrefixName.Contains(keyword)) ||
(x.FirstName == null ? false : x.FirstName.Contains(keyword)) || //(x.FirstName == null ? false : x.FirstName.Contains(keyword)) ||
(x.LastName == null ? false : x.LastName.Contains(keyword)) || //(x.LastName == null ? false : x.LastName.Contains(keyword)) ||
(x.PrefixName + x.FirstName + " " + x.LastName).Contains(keyword) ||
(x.ExamIdenNumber == null ? false : x.ExamIdenNumber.Contains(keyword)) || (x.ExamIdenNumber == null ? false : x.ExamIdenNumber.Contains(keyword)) ||
(x.SeatNumber == null ? false : x.SeatNumber.Contains(keyword)) || (x.SeatNumber == null ? false : x.SeatNumber.Contains(keyword)) ||
(x.ResultA == null ? false : x.ResultA.Contains(keyword)) || (x.ResultA == null ? false : x.ResultA.Contains(keyword)) ||
@ -879,12 +885,14 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
var _candidate = await _context.Candidates.AsQueryable() var _candidate = await _context.Candidates.AsQueryable()
.Where(x => x.PeriodExam == periodExam && x.RegisterDate != null && x.Status != "register" && x.Status != "rejectRegister") .Where(x => x.PeriodExam == periodExam && x.RegisterDate != null && x.Status != "register" && x.Status != "rejectRegister")
.Where(x => .Where(x =>
(x.PositionExam == null || x.PositionExam.PositionLevelName == null ? false : x.PositionExam.PositionLevelName.Contains(keyword)) || //(x.PositionExam == null || x.PositionExam.PositionLevelName == null ? false : x.PositionExam.PositionLevelName.Contains(keyword)) ||
(x.PositionExam == null || x.PositionExam.PositionName == null ? false : x.PositionExam.PositionName.Contains(keyword)) || //(x.PositionExam == null || x.PositionExam.PositionName == null ? false : x.PositionExam.PositionName.Contains(keyword)) ||
(x.PositionExam.PositionName + x.PositionExam.PositionLevelName).Contains(keyword) ||
(x.CitizenId == null ? false : x.CitizenId.Contains(keyword)) || (x.CitizenId == null ? false : x.CitizenId.Contains(keyword)) ||
(x.PrefixName == null ? false : x.PrefixName.Contains(keyword)) || //(x.PrefixName == null ? false : x.PrefixName.Contains(keyword)) ||
(x.FirstName == null ? false : x.FirstName.Contains(keyword)) || //(x.FirstName == null ? false : x.FirstName.Contains(keyword)) ||
(x.LastName == null ? false : x.LastName.Contains(keyword)) || //(x.LastName == null ? false : x.LastName.Contains(keyword)) ||
(x.PrefixName + x.FirstName + " " + x.LastName).Contains(keyword) ||
(x.ExamIdenNumber == null ? false : x.ExamIdenNumber.Contains(keyword)) || (x.ExamIdenNumber == null ? false : x.ExamIdenNumber.Contains(keyword)) ||
(x.SeatNumber == null ? false : x.SeatNumber.Contains(keyword)) || (x.SeatNumber == null ? false : x.SeatNumber.Contains(keyword)) ||
(x.ResultA == null ? false : x.ResultA.Contains(keyword)) || (x.ResultA == null ? false : x.ResultA.Contains(keyword)) ||