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

Correct Sort Order

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-05-23 11:37:41 +07:00
parent 58b890d6a5
commit 4c1c3f5da8
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Controllers/ExamReportController.cs
View file

@ -392,7 +392,7 @@ namespace BMA.EHR.Report.Service.Controllers
ExamName = $"{p.PeriodExam.Name} ครั้งที่ {p.PeriodExam.Round}/{p.PeriodExam.Year.Value.ToThaiYear()}", ExamName = $"{p.PeriodExam.Name} ครั้งที่ {p.PeriodExam.Round}/{p.PeriodExam.Year.Value.ToThaiYear()}",
Number = sr == null ? "" : sr.Number, Number = sr == null ? 99999 : Convert.ToInt32(sr.Number),
@ -458,27 +458,27 @@ namespace BMA.EHR.Report.Service.Controllers
.ThenInclude(x => x.ScoreImport) .ThenInclude(x => x.ScoreImport)
.Select(p => new .Select(p => new
{ {
Id = p.PeriodExam.Id, Id = p.PeriodExam.Id,
ExamId = p.SeatNumber, ExamId = p.SeatNumber,
CitizenId = p.CitizenId, CitizenId = p.CitizenId,
FullName = $"{p.FirstName} {p.LastName}", FullName = $"{p.FirstName} {p.LastName}",
DateOfBirth = p.DateOfBirth.Value.ToThaiShortDate(), DateOfBirth = p.DateOfBirth.Value.ToThaiShortDate(),
ExamName = $"{p.PeriodExam.Name} ครั้งที่ {p.PeriodExam.Round}/{p.PeriodExam.Year.Value.ToThaiYear()}", ExamName = $"{p.PeriodExam.Name} ครั้งที่ {p.PeriodExam.Round}/{p.PeriodExam.Year.Value.ToThaiYear()}",
Number = p.Number, Number = p.Number == null ? 99999 : Convert.ToInt32(p.Number),
FullA = 0, FullA = 0,
SumA =0, SumA = 0,
FullB = p.PointTotalB, FullB = p.PointTotalB,
SumB = p.PointB, SumB = p.PointB,
FullC = p.PointTotalC, FullC = p.PointTotalC,
SumC = p.PointC, SumC = p.PointC,
SumScore = p.PointB + p.PointC, SumScore = p.PointB + p.PointC,
ExamResult = p.Pass ExamResult = p.Pass
}) })
.OrderBy(x => x.Number) .OrderBy(x => x.Number)
.Where(x => x.Id == id) .Where(x => x.Id == id)
.Where(x => x.ExamResult == "ผ่าน") .Where(x => x.ExamResult == "ผ่าน")

2
Controllers/RecruitReportController.cs
View file

@ -310,7 +310,7 @@ namespace BMA.EHR.Report.Service.Controllers
ExamName = $"{p.RecruitImport.Name} ครั้งที่ {p.RecruitImport.Order}/{p.RecruitImport.Year.ToThaiYear()}", ExamName = $"{p.RecruitImport.Name} ครั้งที่ {p.RecruitImport.Order}/{p.RecruitImport.Year.ToThaiYear()}",
Number = sr == null ? "" : sr.Number, Number = sr == null ? 99999 : Convert.ToInt32(sr.Number),
ExamCount = _recruitService.GetExamCount(p.CitizenId), ExamCount = _recruitService.GetExamCount(p.CitizenId),
ScoreExpire = p.RecruitImport.AnnouncementDate == null ? "" : p.RecruitImport.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(), ScoreExpire = p.RecruitImport.AnnouncementDate == null ? "" : p.RecruitImport.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(),