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

เพิ่มเก็บคะแนนภาค ข ค

Browse source
This commit is contained in:
Kittapath 2023-04-25 03:46:57 +07:00
parent 096648cce1
commit 0273a37503
9 changed files with 1816 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Services/CandidateService.cs
View file

@ -1464,7 +1464,13 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
CitizenId = candidate.CitizenId,
ExamIdenNumber = candidate.ExamIdenNumber,
SeatNumber = candidate.SeatNumber,
Point = candidate.Point,
PointTotalB = candidate.PointTotalB,
PointB = candidate.PointB,
ResultB = candidate.ResultB,
PointTotalC = candidate.PointTotalC,
PointC = candidate.PointC,
ResultC = candidate.ResultC,
Pass = candidate.Pass,
Id = candidate.Id,
};
}

48
Services/PeriodExamService.cs
View file

@ -689,7 +689,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
public async Task<IEnumerable<Education?>> GetsAsyncEducation(string candidateId)
{
return await _context.Educations.AsQueryable()
.Where(x => x.Id == Guid.Parse(candidateId))
.Where(x => x.Candidate.Id == Guid.Parse(candidateId))
.OrderBy(d => d.DurationStart)
.ToListAsync();
}
@ -697,7 +697,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
public async Task<IEnumerable<Career?>> GetsAsyncCareer(string candidateId)
{
return await _context.Careers.AsQueryable()
.Where(x => x.Id == Guid.Parse(candidateId))
.Where(x => x.Candidate.Id == Guid.Parse(candidateId))
.OrderBy(d => d.DurationStart)
.ToListAsync();
}
@ -753,11 +753,16 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
{
list.Add(new RequestImportSeat
{
CitizenId = worksheet.Cells[row, 1].Value != null ? worksheet.Cells[row, 1].Value.ToString() : "-",
ExamIdenNumber = worksheet.Cells[row, 2].Value != null ? worksheet.Cells[row, 2].Value.ToString() : "-",
SeatNumber = worksheet.Cells[row, 3].Value != null ? worksheet.Cells[row, 3].Value.ToString() : "-",
Point = worksheet.Cells[row, 4].Value != null ? worksheet.Cells[row, 4].Value.ToString() : "-",
Pass = worksheet.Cells[row, 4].Value != null ? (worksheet.Cells[row, 4].Value.ToString() == "1" ? true : false) : null,
CitizenId = worksheet.Cells[row, 1].Value != null ? worksheet.Cells[row, 1].Value.ToString() : null,
ExamIdenNumber = worksheet.Cells[row, 2].Value != null ? worksheet.Cells[row, 2].Value.ToString() : null,
SeatNumber = worksheet.Cells[row, 3].Value != null ? worksheet.Cells[row, 3].Value.ToString() : null,
PointTotalB = worksheet.Cells[row, 4].Value != null ? worksheet.Cells[row, 4].Value.ToString() : null,
PointB = worksheet.Cells[row, 5].Value != null ? worksheet.Cells[row, 5].Value.ToString() : null,
ResultB = worksheet.Cells[row, 6].Value != null ? worksheet.Cells[row, 6].Value.ToString() : null,
PointTotalC = worksheet.Cells[row, 7].Value != null ? worksheet.Cells[row, 7].Value.ToString() : null,
PointC = worksheet.Cells[row, 8].Value != null ? worksheet.Cells[row, 8].Value.ToString() : null,
ResultC = worksheet.Cells[row, 9].Value != null ? worksheet.Cells[row, 9].Value.ToString() : null,
Pass = worksheet.Cells[row, 10].Value != null ? (worksheet.Cells[row, 10].Value.ToString()) : null,
});
}
}
@ -830,7 +835,12 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
{
if (candidate.Status == "checkPoint" || candidate.Status == "done")
{
candidate.Point = item.Point;
candidate.PointTotalB = item.PointTotalB;
candidate.PointB = item.PointB;
candidate.ResultB = item.ResultB;
candidate.PointTotalC = item.PointTotalC;
candidate.PointC = item.PointC;
candidate.ResultC = item.ResultC;
candidate.Pass = item.Pass;
candidate.Status = "done";
}
@ -885,8 +895,13 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
summarySheet.Cells[1, 1].Value = "เลขบัตรประชาชน";
summarySheet.Cells[1, 2].Value = "เลขประจำตัวสอบ";
summarySheet.Cells[1, 3].Value = "เลขที่นั่งสอบ";
summarySheet.Cells[1, 4].Value = "คะแนน";
summarySheet.Cells[1, 5].Value = "ผลการสอบ";
summarySheet.Cells[1, 4].Value = "คะแนนเต็มภาค ข";
summarySheet.Cells[1, 5].Value = "คะแนนเต็มภาค ข";
summarySheet.Cells[1, 6].Value = "ผลสอบภาค ข";
summarySheet.Cells[1, 7].Value = "คะแนนเต็มภาค ค";
summarySheet.Cells[1, 8].Value = "คะแนนเต็มภาค ค";
summarySheet.Cells[1, 9].Value = "ผลสอบภาค ค";
summarySheet.Cells[1, 10].Value = "ผลการสอบ";
int row = 2;
foreach (var item in candidates)
@ -894,8 +909,13 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
summarySheet.Cells[row, 1].Value = item.CitizenId;
summarySheet.Cells[row, 2].Value = item.ExamIdenNumber;
summarySheet.Cells[row, 3].Value = item.SeatNumber;
summarySheet.Cells[row, 4].Value = item.Point;
summarySheet.Cells[row, 5].Value = item.Pass;
summarySheet.Cells[row, 4].Value = item.PointTotalB;
summarySheet.Cells[row, 5].Value = item.PointB;
summarySheet.Cells[row, 6].Value = item.ResultB;
summarySheet.Cells[row, 7].Value = item.PointTotalC;
summarySheet.Cells[row, 8].Value = item.PointC;
summarySheet.Cells[row, 9].Value = item.ResultC;
summarySheet.Cells[row, 10].Value = item.Pass;
row++;
}
summarySheet.Cells[summarySheet.Dimension.Address].AutoFitColumns();
@ -959,13 +979,13 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
{
Id = 4,
Name = "ผ่านการสอบ",
Count = periodExam.Candidate.Where(x=>x.Pass == true).Count()
Count = periodExam.Candidate.Where(x=>x.Pass.Contains("ผ่าน")).Count()
},
new DashboardResponseItem
{
Id = 5,
Name = "ไม่ผ่านการสอบ",
Count = periodExam.Candidate.Where(x=>x.Pass == false).Count()
Count = periodExam.Candidate.Where(x=>!x.Pass.Contains("ผ่าน")).Count()
},
new DashboardResponseItem
{