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
All checks were successful
Build & Deploy on Dev / build (push) Successful in 39s
Details

Browse source
This commit is contained in:
Warunee Tamkoo 2025-09-22 10:05:15 +07:00
commit a6181fea32
1 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Controllers/RecruitController.cs
View file

@ -910,19 +910,19 @@ namespace BMA.EHR.Recruit.Service.Controllers
var data = await _context.RecruitImports.AsQueryable() var data = await _context.RecruitImports.AsQueryable()
.Include(x => x.ImportHostories) .Include(x => x.ImportHostories)
.Include(x => x.ImportFile) .Include(x => x.ImportFile)
.Include(x => x.Recruits) //.Include(x => x.Recruits)
.ThenInclude(x => x.Addresses) //.ThenInclude(x => x.Addresses)
.Include(x => x.Recruits) //.Include(x => x.Recruits)
.ThenInclude(x => x.Occupations) //.ThenInclude(x => x.Occupations)
.Include(x => x.Recruits) //.Include(x => x.Recruits)
.ThenInclude(x => x.Certificates) //.ThenInclude(x => x.Certificates)
.Include(x => x.Recruits) //.Include(x => x.Recruits)
.ThenInclude(x => x.Educations) //.ThenInclude(x => x.Educations)
.Include(x => x.Recruits) //.Include(x => x.Recruits)
.ThenInclude(x => x.Payments) //.ThenInclude(x => x.Payments)
.Include(x => x.Recruits) //.Include(x => x.Recruits)
.ThenInclude(x => x.Documents) //.ThenInclude(x => x.Documents)
.ThenInclude(x => x.DocumentFile) //.ThenInclude(x => x.DocumentFile)
.Include(x => x.ScoreImport) .Include(x => x.ScoreImport)
.ThenInclude(x => x.ImportFile) .ThenInclude(x => x.ImportFile)
.Include(x => x.ScoreImport) .Include(x => x.ScoreImport)
@ -1693,6 +1693,11 @@ namespace BMA.EHR.Recruit.Service.Controllers
cmd.Parameters.Add(new MySqlParameter("@r", req.ExamResult)); cmd.Parameters.Add(new MySqlParameter("@r", req.ExamResult));
} }
sb.Append(" ORDER BY examID ");
sb.Append(" LIMIT @PageSize OFFSET @Offset ");
cmd.Parameters.Add(new MySqlParameter("@PageSize", req.PageSize));
cmd.Parameters.Add(new MySqlParameter("@Offset", ((req.Page - 1) * req.PageSize)));
cmd.CommandText = sb.ToString(); cmd.CommandText = sb.ToString();
_context.Database.OpenConnection(); _context.Database.OpenConnection();
@ -1735,8 +1740,8 @@ namespace BMA.EHR.Recruit.Service.Controllers
} }
if (data != null && data.Count > 0) //if (data != null && data.Count > 0)
data = data.Skip((req.Page - 1) * req.PageSize).Take(req.PageSize).ToList(); // data = data.Skip((req.Page - 1) * req.PageSize).Take(req.PageSize).ToList();
dynamic header = null; dynamic header = null;
using (var cmd = _context.Database.GetDbConnection().CreateCommand()) using (var cmd = _context.Database.GetDbConnection().CreateCommand())
@ -2669,7 +2674,7 @@ namespace BMA.EHR.Recruit.Service.Controllers
// ======= Table Header ======= // ======= Table Header =======
ws.Cells[row, 1].Value = "ลำดับ"; ws.Cells[row, 1].Value = "ลำดับ";
ws.Cells[row, 2].Value = "เลขอ้างอิง"; ws.Cells[row, 2].Value = "เลขประจำตัวสอบ";
ws.Cells[row, 3].Value = "ชื่อ-สกุล"; ws.Cells[row, 3].Value = "ชื่อ-สกุล";
ws.Cells[row, 4].Value = "หมายเหตุ"; ws.Cells[row, 4].Value = "หมายเหตุ";