Compare commits
No commits in common. "146db902fcb604a184e0d7d842aa8e61fda31c66" and "821fc62daa6b7f0e49d27dea6f54a69a57e2d392" have entirely different histories.
146db902fc
...
821fc62daa
1 changed files with 4 additions and 7 deletions
|
|
@ -1089,8 +1089,6 @@ namespace BMA.EHR.Report.Service.Controllers
|
|||
if (periodExam == null)
|
||||
return Error("ไม่พบข้อมูลการรับสมัครสอบ", 404);
|
||||
|
||||
var examName = $"{periodExam.Name} ครั้งที่ {periodExam.Round}/{periodExam.Year.Value.ToThaiYear()}".ToThaiNumber();
|
||||
|
||||
var candidates = await _context.Candidates.AsQueryable()
|
||||
.Include(x => x.PeriodExam)
|
||||
.ThenInclude(x => x.PositionExam)
|
||||
|
|
@ -1104,18 +1102,17 @@ namespace BMA.EHR.Report.Service.Controllers
|
|||
PositionName = p.PositionExam!.PositionName,
|
||||
FullName = $"{p.PrefixName ?? ""}{p.FirstName ?? ""} {p.LastName ?? ""}".Trim(),
|
||||
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),
|
||||
ExamIdenNumber = string.IsNullOrEmpty(p.ExamIdenNumber) ? "-" : p.ExamIdenNumber.ToThaiNumber(),
|
||||
})
|
||||
.OrderBy(x => x.Number)
|
||||
.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
|
||||
var groupData = data
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue