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

Merge branch 'develop' into dev

Browse source
This commit is contained in:
harid 2026-06-09 18:21:17 +07:00
commit 5a32d449f8
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Controllers/DisableController.cs
View file

@ -2538,7 +2538,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
} }
/// <summary> /// <summary>
/// โอนคนสรรหาไปบรรจุ /// โอนคนสรรหาไปบรรจุ (คัดเลือกอื่นๆ)
/// </summary> /// </summary>
/// <param name="examId">รหัสรอบสมัคร</param> /// <param name="examId">รหัสรอบสมัคร</param>
/// <returns></returns> /// <returns></returns>

2
Controllers/PeriodExamController.cs
View file

@ -1002,7 +1002,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
} }
/// <summary> /// <summary>
/// โอนคนสรรหาไปบรรจุ /// โอนคนสรรหาไปบรรจุ (สอบคัดเลือก)
/// </summary> /// </summary>
/// <param name="examId">รหัสรอบสมัคร</param> /// <param name="examId">รหัสรอบสมัคร</param>
/// <returns></returns> /// <returns></returns>

4
Services/PeriodExamService.cs
View file

@ -3177,7 +3177,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
throw new Exception(GlobalMessages.ExamNotFound); throw new Exception(GlobalMessages.ExamNotFound);
var _placement = await _contextMetadata.Placements.AsQueryable() var _placement = await _contextMetadata.Placements.AsQueryable()
.FirstOrDefaultAsync(x => x.PlacementType.Name == "คัดเลือกคนพิการ" && x.RefId == periodExam.Id); .FirstOrDefaultAsync(x => x.PlacementType.Name == "คัดเลือกอื่นๆ" && x.RefId == periodExam.Id);
if (_placement != null) if (_placement != null)
throw new Exception("รอบการสอบนี้ได้ทำการบรรจุไปแล้ว"); throw new Exception("รอบการสอบนี้ได้ทำการบรรจุไปแล้ว");
@ -3195,7 +3195,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
Round = periodExam.Round?.ToString() ?? "", Round = periodExam.Round?.ToString() ?? "",
Year = (int)(periodExam.Year ?? 0), Year = (int)(periodExam.Year ?? 0),
Number = await _context.Disables.AsQueryable().Where(x => x.PeriodExam == periodExam).CountAsync(), Number = await _context.Disables.AsQueryable().Where(x => x.PeriodExam == periodExam).CountAsync(),
PlacementType = placementTypesCache.FirstOrDefault(x => x.Name.Trim().ToUpper().Contains("คัดเลือกคนพิการ")) ?? placementTypesCache.First(), PlacementType = placementTypesCache.FirstOrDefault(x => x.Name.Trim().ToUpper().Contains("คัดเลือกอื่นๆ")) ?? placementTypesCache.First(),
StartDate = accountStartDate, StartDate = accountStartDate,
EndDate = accountStartDate.AddYears(2).AddDays(-1), EndDate = accountStartDate.AddYears(2).AddDays(-1),
CreatedAt = DateTime.Now, CreatedAt = DateTime.Now,