แก้ค้นหาชื่อเต็ม + นำเข้าแล้วลำดับสอบแถวสุดท้ายไม่อัพเดท (#5)

Co-authored-by: harid <harid_pr61@live.rmutl.com>
This commit is contained in:
Harid Promsri 2025-10-22 14:19:26 +07:00 committed by GitHub
parent 29d9dde7ec
commit ee9e233e99
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1562,12 +1562,12 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
for (int i = 0; i < c_package.Workbook.Worksheets.Count; i++)
{
var workSheet = c_package.Workbook.Worksheets[i];
var totalRows = workSheet.Dimension.Rows;
//var totalRows = workSheet.Dimension.Rows;
var cols = workSheet.GetHeaderColumns();
int row = 8;
while (row <= totalRows)
var endRow = workSheet.Dimension.End.Row; // แถวสุดท้ายที่มีข้อมูล
while (row <= endRow)
{
var cell1 = workSheet?.Cells[row, 1]?.GetValue<string>();
if (cell1 == "" || cell1 == null) break;
@ -1776,10 +1776,10 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
{
foreach (var workSheet in c_package.Workbook.Worksheets)
{
var totalRows = workSheet.Dimension.Rows;
//var totalRows = workSheet.Dimension.Rows;
int row = 7; // เริ่มที่ row 7 ตามตัวอย่างไฟล์
while (row <= totalRows)
var endRow = workSheet.Dimension.End.Row; // แถวสุดท้ายที่มีข้อมูล
while (row <= endRow)
{
var examId = workSheet?.Cells[row, 2]?.GetValue<string>();
if (string.IsNullOrWhiteSpace(examId))
@ -2027,9 +2027,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
query = query.Where(x =>
x.ExamId.Contains(keywordParam) ||
x.CitizenId.Contains(keywordParam) ||
x.Prefix.Contains(keywordParam) ||
x.FirstName.Contains(keywordParam) ||
x.LastName.Contains(keywordParam) ||
(x.Prefix + x.FirstName + " " + x.LastName).Contains(keywordParam) ||
x.HddPosition.Contains(keywordParam) ||
x.PositionName.Contains(keywordParam)
);