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

Merge branch 'develop' into dev

Browse source 
* develop:
  แก้ค้นหาชื่อเต็ม + นำเข้าแล้วลำดับสอบแถวสุดท้ายไม่อัพเดท (#8)
This commit is contained in:
Warunee Tamkoo 2025-11-04 09:03:42 +07:00
commit 7e2cedbbbc
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Controllers/RecruitController.cs
View file

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