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-06 14:56:12 +07:00
parent a7b798b52a
commit 7af68ae435
2 changed files with 37 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Controllers/ExamReportController.cs
View file

@ -432,25 +432,28 @@ namespace BMA.EHR.Report.Service.Controllers
{
Id = p.PeriodExam.Id,
ExamId = p.ExamId != null ? p.ExamId.ToThaiNumber() : string.Empty,
CitizenId = p.CitizenId == null ? "-" : (p.CitizenId).ToThaiNumber(),
p.Prefix,
//CitizenId = p.CitizenId == null ? "-" : (p.CitizenId).ToThaiNumber(),
//p.Prefix,
FullName = $"{p.Prefix}{p.FirstName} {p.LastName}",
DateOfBirth = (p.DateOfBirth.ToThaiShortDate()),
Gender = p.Gendor,
Degree = p.Educations.First().Degree,
Major = p.Educations.First().Major,
//DateOfBirth = (p.DateOfBirth.ToThaiShortDate()),
//Gender = p.Gendor,
//Degree = p.Educations.First().Degree,
//Major = p.Educations.First().Major,
ExamResult = sr == null ? "" : sr.ExamStatus,
University = p.Educations.First().University,
PositionName = p.PositionName,
//University = p.Educations.First().University,
//PositionName = p.PositionName,
ExamName = $"{p.PeriodExam.Name} ครั้งที่ {p.PeriodExam.Round.ToString().ToThaiNumber()}/{p.PeriodExam.Year.Value.ToThaiYear().ToString().ToThaiNumber()}",
Number = sr == null ? "๐" : sr.Number,
FullA = sr == null ? "๐" : (sr.FullA.ToString()),
SumA = sr == null ? "๐" : (sr.SumA.ToString()),
FullB = sr == null ? "๐" : (sr.FullB.ToString()),
SumB = sr == null ? "๐" : (sr.SumB.ToString()),
FullC = sr == null ? "๐" : (sr.FullC.ToString()),
SumC = sr == null ? "๐" : (sr.SumC.ToString()),
SumScore = sr == null ? "๐" : ((sr.SumA + sr.SumB + sr.SumC).ToString()).ToThaiNumber(),
//FullA = sr == null ? "๐" : (sr.FullA.ToString()),
//SumA = sr == null ? "๐" : (sr.SumA.ToString()),
//FullB = sr == null ? "๐" : (sr.FullB.ToString()),
//SumB = sr == null ? "๐" : (sr.SumB.ToString()),
//FullC = sr == null ? "๐" : (sr.FullC.ToString()),
//SumC = sr == null ? "๐" : (sr.SumC.ToString()),
SumScore = sr == null
? "๐"
//: (((sr.SumA > 0 ? sr.SumA : 0) + /*sr.SumB +*/ (sr.SumC > 0 ? sr.SumC : 0)).ToString()).ToThaiNumber(),
: (((sr.SumA > 0 ? sr.SumA : 0) + (sr.SumB > 0 ? sr.SumB : 0 ) + (sr.SumC > 0 ? sr.SumC : 0)).ToString()).ToThaiNumber(),
})
.OrderBy(x => x.Number)
.Where(x => x.Id == id)
@ -462,7 +465,7 @@ namespace BMA.EHR.Report.Service.Controllers
var data_ = data.Select(x => new
{
x.ExamName,
Number = x.Number.ToString().ToThaiNumber(),
Number = x.Number.ToThaiNumber(),
x.ExamId,
x.FullName,
x.SumScore

36
Controllers/RecruitReportController.cs
View file

@ -406,37 +406,37 @@ namespace BMA.EHR.Report.Service.Controllers
{
Id = p.RecruitImport.Id,
ExamId = p.ExamId != null ? p.ExamId.ToThaiNumber() : string.Empty,
CitizenId = p.CitizenId,
p.Prefix,
//CitizenId = p.CitizenId,
//p.Prefix,
FullName = $"{p.Prefix}{p.FirstName} {p.LastName}",
DateOfBirth = p.DateOfBirth == null ? "" : p.DateOfBirth.ToThaiShortDate(),
Gender = p.Gendor,
Degree = p.Educations.FirstOrDefault() == null ? "" : p.Educations.FirstOrDefault().Degree,
Major = p.Educations.FirstOrDefault() == null ? "" : p.Educations.FirstOrDefault().Major,
//DateOfBirth = p.DateOfBirth == null ? "" : p.DateOfBirth.ToThaiShortDate(),
//Gender = p.Gendor,
//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.FirstOrDefault() == null ? "" : p.Educations.FirstOrDefault().University,
PositionName = p.PositionName,
//University = p.Educations.FirstOrDefault() == null ? "" : p.Educations.FirstOrDefault().University,
//PositionName = p.PositionName,
ExamName = p.RecruitImport.Order == null
? ""
: $"{p.RecruitImport.Name} ครั้งที่ {p.RecruitImport.Order.ToString().ToThaiNumber()}/{p.RecruitImport.Year.ToThaiYear().ToString().ToThaiNumber()}",
Number = sr.Number == null ? "๐" : sr.Number,
ExamCount = _recruitService.GetExamCount(p.CitizenId),
ScoreExpire = p.RecruitImport.AnnouncementDate == null ? "" : p.RecruitImport.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(),
//ExamCount = _recruitService.GetExamCount(p.CitizenId),
//ScoreExpire = p.RecruitImport.AnnouncementDate == null ? "" : p.RecruitImport.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(),
FullA = sr.FullA == null ? 0.0 : sr.FullA,
SumA = sr.SumA == null ? 0.0 : sr.SumA,
//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(),
//FullC = sr.FullC == null ? 0.0 : sr.FullC,
//SumC = sr.SumC == null ? 0.0 : sr.SumC,
SumScore = sr == null
? "๐"
: (((sr.SumA > 0 ? sr.SumA : 0) + /*sr.SumB +*/ (sr.SumC > 0 ? sr.SumC : 0)).ToString()).ToThaiNumber(),
})
.OrderBy(x => x.Number)
.Where(x => x.Id == id)
@ -448,7 +448,7 @@ namespace BMA.EHR.Report.Service.Controllers
var data_ = data.Select(x => new
{
x.ExamName,
Number = x.Number.ToString().ToThaiNumber(),
Number = x.Number.ToThaiNumber(),
x.ExamId,
x.FullName,
x.SumScore