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

Fix download report error

Browse source
This commit is contained in:
Bright 2025-09-03 11:18:56 +07:00
parent f52b750ac0
commit a7b798b52a
1 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Controllers/RecruitReportController.cs
View file

@ -198,8 +198,8 @@ namespace BMA.EHR.Report.Service.Controllers
FullA = sr == null ? 0.0 : sr.FullA,
SumA = sr == null ? 0.0 : sr.SumA,
FullB = sr == null ? 0.0 : sr.FullB,
SumB = sr == null ? 0.0 : sr.SumB,
//FullB = sr == null ? 0.0 : sr.FullB,
//SumB = sr == null ? 0.0 : sr.SumB,
FullC = sr == null ? 0.0 : sr.FullC,
SumC = sr == null ? 0.0 : sr.SumC,
@ -409,33 +409,34 @@ namespace BMA.EHR.Report.Service.Controllers
CitizenId = p.CitizenId,
p.Prefix,
FullName = $"{p.Prefix}{p.FirstName} {p.LastName}",
DateOfBirth = p.DateOfBirth.ToThaiShortDate(),
DateOfBirth = p.DateOfBirth == null ? "" : p.DateOfBirth.ToThaiShortDate(),
Gender = p.Gendor,
Degree = p.Educations.First().Degree,
Major = p.Educations.First().Major,
Degree = p.Educations.FirstOrDefault() == null ? "" : p.Educations.FirstOrDefault().Degree,
Major = p.Educations.FirstOrDefault() == null ? "" : p.Educations.FirstOrDefault().Major,
ExamResult = sr == null ? "" : sr.ExamStatus,
University = p.Educations.First().University,
University = p.Educations.FirstOrDefault() == null ? "" : p.Educations.FirstOrDefault().University,
PositionName = p.PositionName,
ExamName = $"{p.RecruitImport.Name} ครั้งที่ {p.RecruitImport.Order.ToString().ToThaiNumber()}/{p.RecruitImport.Year.ToThaiYear().ToString().ToThaiNumber()}",
ExamName = p.RecruitImport.Order == null
? ""
: $"{p.RecruitImport.Name} ครั้งที่ {p.RecruitImport.Order.ToString().ToThaiNumber()}/{p.RecruitImport.Year.ToThaiYear().ToString().ToThaiNumber()}",
Number = sr == null ? "๐" : sr.Number,
Number = sr.Number == null ? "๐" : sr.Number,
ExamCount = _recruitService.GetExamCount(p.CitizenId),
ScoreExpire = p.RecruitImport.AnnouncementDate == null ? "" : p.RecruitImport.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(),
FullA = sr == null ? 0.0 : sr.FullA,
SumA = sr == null ? 0.0 : sr.SumA,
FullB = sr == null ? 0.0 : sr.FullB,
SumB = sr == null ? 0.0 : sr.SumB,
FullC = sr == null ? 0.0 : sr.FullC,
SumC = sr == null ? 0.0 : sr.SumC,
SumScore = sr == null ? "๐" : (sr.SumA + sr.SumB + sr.SumC).ToString().ToThaiNumber(),
FullA = sr.FullA == null ? 0.0 : sr.FullA,
SumA = sr.SumA == null ? 0.0 : sr.SumA,
//FullB = sr.FullB == null ? 0.0 : sr.FullB,
//SumB = sr.SumB == null ? 0.0 : sr.SumB,
FullC = sr.FullC == null ? 0.0 : sr.FullC,
SumC = sr.SumC == null ? 0.0 : sr.SumC,
SumScore = sr.SumA == null && sr.SumC == null
? "๐"
: (sr.SumA + /*sr.SumB +*/ sr.SumC).ToString().ToThaiNumber(),
})
.OrderBy(x => x.Number)
.Where(x => x.Id == id)