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

fix report สรรหา

Browse source
This commit is contained in:
harid 2026-06-30 17:35:53 +07:00
parent ec8ed62f2b
commit fe905f7f54
2 changed files with 50 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Controllers/RecruitReportController.cs
View file

@ -358,7 +358,7 @@ namespace BMA.EHR.Report.Service.Controllers
{
FullName = $"{p.Prefix}{p.FirstName} {p.LastName}",
PositionName = p.PositionName,
Remark = !string.IsNullOrEmpty(p.Remark) ? p.Remark.ToThaiNumber() : "",
// Remark = !string.IsNullOrEmpty(p.Remark) ? p.Remark.ToThaiNumber() : "",
ExamId = !string.IsNullOrEmpty(p.ExamId) ? p.ExamId.ToThaiNumber() : "",
ExamName =
$"ครั้งที่ {(p.RecruitImport != null ? p.RecruitImport.Order.ToString().ToThaiNumber() : "")}/{(p.RecruitImport != null ? p.RecruitImport.Year.ToThaiYear().ToString().ToThaiNumber() : "")}",
@ -380,7 +380,7 @@ namespace BMA.EHR.Report.Service.Controllers
No = (index + 1).ToString().ToThaiNumber(),
ExamId = x.ExamId,
FullName = x.FullName,
Remark = x.Remark
// Remark = x.Remark
}).ToList()
})
.ToList();
@ -426,7 +426,7 @@ namespace BMA.EHR.Report.Service.Controllers
var table = new iText.Layout.Element.Table(UnitValue.CreatePercentArray(columnWidths)).UseAllAvailableWidth();
// Table Header
string[] headers = { "ลำดับที่", "เลขประจำตัวสอบ", "ชื่อ-สกุล", "หมายเหตุ" };
string[] headers = { "ลำดับที่", "เลขประจำตัวสอบ", "ชื่อ - สกุล", "หมายเหตุ" };
foreach (var h in headers)
{
table.AddHeaderCell(new Cell()
@ -444,8 +444,7 @@ namespace BMA.EHR.Report.Service.Controllers
.SetTextAlignment(TextAlignment.CENTER));
table.AddCell(new Cell().Add(new Paragraph(x.FullName ?? "").SetMultipliedLeading(1.0f))
.SetTextAlignment(TextAlignment.LEFT));
table.AddCell(new Cell().Add(new Paragraph(x.Remark ?? "").SetMultipliedLeading(1.0f))
.SetTextAlignment(TextAlignment.CENTER));
table.AddCell(new Cell());
}
document.Add(table);
// เว้นระหว่าง groups
@ -558,7 +557,7 @@ namespace BMA.EHR.Report.Service.Controllers
.Join(_context.RecruitScores.AsQueryable()
.Include(x => x.ScoreImport)
.Where(x => x.ScoreImport.RecruitImportId == id)
.Where(x => x.ExamStatus == "ผ่าน"),
.Where(x => x.ExamStatus == "ผ่าน" && !string.IsNullOrEmpty(x.Number)),
rc => new { id = rc.RecruitImport.Id, examId = rc.ExamId },
sc => new { id = sc.ScoreImport.RecruitImportId, examId = sc.ExamId },
(p, sr) => new
@ -570,12 +569,12 @@ namespace BMA.EHR.Report.Service.Controllers
? ""
: $"{p.RecruitImport.Name} ครั้งที่ {p.RecruitImport.Order.ToString().ToThaiNumber()}/{p.RecruitImport.Year.ToThaiYear().ToString().ToThaiNumber()}",
Number = sr == null || sr.Number == null ? 0 : Convert.ToInt32(sr.Number),
SumScore = sr == null
? "๐"
: (((decimal)(sr.SumA > 0 ? sr.SumA : 0) + (sr.SumB > 0 ? sr.SumB : 0) + (sr.SumC > 0 ? sr.SumC : 0)).ToString("0.00")).ToThaiNumber(),
ExamId = string.IsNullOrEmpty(p.ExamId) ? "-" : p.ExamId.ToThaiNumber(),
// SumScore = sr == null
// ? "๐"
// : (((decimal)(sr.SumA > 0 ? sr.SumA : 0) + (sr.SumB > 0 ? sr.SumB : 0) + (sr.SumC > 0 ? sr.SumC : 0)).ToString("0.00")).ToThaiNumber(),
})
.OrderBy(x => x.Number)
.Where(x => x.ExamResult == "ผ่าน")
.ToListAsync();
if (data.Count == 0)
@ -594,7 +593,8 @@ namespace BMA.EHR.Report.Service.Controllers
{
Number = x.Number > 0 ? x.Number.ToString().ToThaiNumber() : "",
FullName = x.FullName,
SumScore = x.SumScore
// SumScore = x.SumScore
ExamId = x.ExamId,
}).ToList()
})
.ToList();
@ -611,13 +611,13 @@ namespace BMA.EHR.Report.Service.Controllers
document.SetFont(font).SetFontSize(16);
document.SetMargins(30, 15, 20, 15);
var title = new Paragraph($"รายชื่อผู้สอบแข่งขันได้\n{examName}")
var title = new Paragraph($"รายชื่อผู้สอบแข่งขันได้\nใน{examName}")
.SetMultipliedLeading(1.0f)
.SetBold()
.SetTextAlignment(TextAlignment.CENTER);
document.Add(title);
float[] columnWidths = { 10f, 20f, 45f, 25f };
float[] columnWidths = { 10f, 25f, 25f, 25f };
foreach (var g in groupData)
{
// Header per group
@ -631,7 +631,7 @@ namespace BMA.EHR.Report.Service.Controllers
var table = new iText.Layout.Element.Table(UnitValue.CreatePercentArray(columnWidths)).UseAllAvailableWidth();
string[] headers = { "ลำดับที่", "สนามสอบ", "ชื่อ - นามสกุล", "คะแนนสอบ" };
string[] headers = { "ลำดับที่", "เลขประจำตัวสอบ", "ชื่อ - สกุล", "หมายเหตุ" };
foreach (var h in headers)
{
table.AddHeaderCell(new Cell()
@ -644,11 +644,11 @@ namespace BMA.EHR.Report.Service.Controllers
{
table.AddCell(new Cell().Add(new Paragraph(p.Number ?? "").SetMultipliedLeading(1.0f))
.SetTextAlignment(TextAlignment.CENTER));
table.AddCell(new Cell());
table.AddCell(new Cell().Add(new Paragraph(p.ExamId ?? "").SetMultipliedLeading(1.0f))
.SetTextAlignment(TextAlignment.CENTER));
table.AddCell(new Cell().Add(new Paragraph(p.FullName ?? "").SetMultipliedLeading(1.0f))
.SetTextAlignment(TextAlignment.LEFT));
table.AddCell(new Cell().Add(new Paragraph(p.SumScore ?? "").SetMultipliedLeading(1.0f))
.SetTextAlignment(TextAlignment.CENTER));
table.AddCell(new Cell());
}
document.Add(table);