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

fix #2578

Browse source
This commit is contained in:
harid 2026-07-01 10:52:38 +07:00
parent fe905f7f54
commit 7d8e8d84ef
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Controllers/ExamReportController.cs
View file

@ -1089,6 +1089,8 @@ namespace BMA.EHR.Report.Service.Controllers
if (periodExam == null) if (periodExam == null)
return Error("ไม่พบข้อมูลการรับสมัครสอบ", 404); return Error("ไม่พบข้อมูลการรับสมัครสอบ", 404);
var examName = $"{periodExam.Name} ครั้งที่ {periodExam.Round}/{periodExam.Year.Value.ToThaiYear()}".ToThaiNumber();
var candidates = await _context.Candidates.AsQueryable() var candidates = await _context.Candidates.AsQueryable()
.Include(x => x.PeriodExam) .Include(x => x.PeriodExam)
.ThenInclude(x => x.PositionExam) .ThenInclude(x => x.PositionExam)
@ -1102,17 +1104,18 @@ namespace BMA.EHR.Report.Service.Controllers
PositionName = p.PositionExam!.PositionName, PositionName = p.PositionExam!.PositionName,
FullName = $"{p.PrefixName ?? ""}{p.FirstName ?? ""} {p.LastName ?? ""}".Trim(), FullName = $"{p.PrefixName ?? ""}{p.FirstName ?? ""} {p.LastName ?? ""}".Trim(),
ExamResult = p.Pass, ExamResult = p.Pass,
ExamName = $"{p.PeriodExam!.Name} ครั้งที่ {p.PeriodExam.Round}/{p.PeriodExam!.Year.Value.ToThaiYear()}".ToThaiNumber(), // ExamName = $"{p.PeriodExam!.Name} ครั้งที่ {p.PeriodExam.Round}/{p.PeriodExam!.Year.Value.ToThaiYear()}".ToThaiNumber(),
Number = string.IsNullOrEmpty(p.Number) ? (idx + 1) : Convert.ToInt32(p.Number), Number = string.IsNullOrEmpty(p.Number) ? (idx + 1) : Convert.ToInt32(p.Number),
ExamIdenNumber = string.IsNullOrEmpty(p.ExamIdenNumber) ? "-" : p.ExamIdenNumber.ToThaiNumber(), ExamIdenNumber = string.IsNullOrEmpty(p.ExamIdenNumber) ? "-" : p.ExamIdenNumber.ToThaiNumber(),
}) })
.OrderBy(x => x.Number) .OrderBy(x => x.Number)
.ToList(); .ToList();
if (data.Count == 0) /*กรณีไม่มีผู้ผ่านการสอบต้องดาวน์โหลดรายงานนี้ได้แต่แสดงเฉพาะส่วนหัว*/
return Error("ไม่พบข้อมูลในระบบ", 404); // if (data.Count == 0)
// return Error("ไม่พบข้อมูลในระบบ", 404);
var examName = data.First().ExamName; // var examName = data.First().ExamName;
// Group by PositionName // Group by PositionName
var groupData = data var groupData = data