Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 55s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 55s
This commit is contained in:
commit
de096feca2
1 changed files with 4 additions and 6 deletions
|
|
@ -3000,10 +3000,8 @@ namespace BMA.EHR.Recruit.Service.Controllers
|
|||
{
|
||||
FullName = $"{p.Prefix}{p.FirstName} {p.LastName}",
|
||||
PositionName = p.PositionName,
|
||||
Remark = p.Remark != null ? p.Remark.ToThaiNumber() : "",
|
||||
RefNo1 = p.Payments.Select(x => x.RefNo1).FirstOrDefault() != null
|
||||
? p.Payments.Select(x => x.RefNo1).FirstOrDefault().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() : "")}",
|
||||
}).ToListAsync();
|
||||
|
|
@ -3024,7 +3022,7 @@ namespace BMA.EHR.Recruit.Service.Controllers
|
|||
Persons = g.Select((x, index) => new
|
||||
{
|
||||
No = (index + 1).ToString().ToThaiNumber(),
|
||||
RefNo1 = x.RefNo1,
|
||||
ExamId = x.ExamId,
|
||||
FullName = x.FullName,
|
||||
Remark = x.Remark
|
||||
}).ToList()
|
||||
|
|
@ -3080,7 +3078,7 @@ namespace BMA.EHR.Recruit.Service.Controllers
|
|||
foreach (var person in group.Persons)
|
||||
{
|
||||
ws.Cells[row, 1].Value = person.No;
|
||||
ws.Cells[row, 2].Value = person.RefNo1;
|
||||
ws.Cells[row, 2].Value = person.ExamId;
|
||||
ws.Cells[row, 3].Value = person.FullName;
|
||||
ws.Cells[row, 4].Value = person.Remark;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue