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-08-17 06:22:10 +07:00
parent 7fbdf971fa
commit 126083cc48
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Controllers/DisableController.cs
View file

@ -1688,7 +1688,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
Score = sr == null ? 0 : sr.SumA + sr.SumB + sr.SumC, Score = sr == null ? 0 : sr.SumA + sr.SumB + sr.SumC,
Number = sr == null ? "" : sr.Number, Number = sr == null ? "" : sr.Number,
CitizenId = p.CitizenId, CitizenId = p.CitizenId,
ExamCount = 0, ExamCount = GetExamCountTe(p.CitizenId),
ScoreExpire = p.PeriodExam.AnnouncementDate == null ? "" : p.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(), ScoreExpire = p.PeriodExam.AnnouncementDate == null ? "" : p.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(),
ScoreResult = sr == null ? null : new ScoreResult = sr == null ? null : new
{ {

9
Services/PeriodExamService.cs
View file

@ -1855,7 +1855,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
Round = periodExam.Round == null ? "" : periodExam.Round.ToString(), Round = periodExam.Round == null ? "" : periodExam.Round.ToString(),
Year = (int)(periodExam.Year == null ? 0 : periodExam.Year), Year = (int)(periodExam.Year == null ? 0 : periodExam.Year),
Number = periodExam.Candidate.Where(x => x.Status.Contains("done")).Count(), Number = periodExam.Candidate.Where(x => x.Status.Contains("done")).Count(),
PlacementType = await _contextMetadata.PlacementTypes.FirstOrDefaultAsync(x => x.Name.Trim().ToUpper().Contains("คัดเลือก")) == null ? await _contextMetadata.PlacementTypes.FirstOrDefaultAsync() : await _contextMetadata.PlacementTypes.FirstOrDefaultAsync(x => x.Name.Trim().ToUpper().Contains("คัดเลือก")), PlacementType = await _contextMetadata.PlacementTypes.FirstOrDefaultAsync(x => x.Name.Trim().ToUpper().Contains("สอบคัดเลือก")) == null ? await _contextMetadata.PlacementTypes.FirstOrDefaultAsync() : await _contextMetadata.PlacementTypes.FirstOrDefaultAsync(x => x.Name.Trim().ToUpper().Contains("สอบคัดเลือก")),
StartDate = DateTime.Now, StartDate = DateTime.Now,
EndDate = DateTime.Now.AddYears(2).AddDays(-1), EndDate = DateTime.Now.AddYears(2).AddDays(-1),
CreatedAt = DateTime.Now, CreatedAt = DateTime.Now,
@ -1866,7 +1866,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
LastUpdateFullName = FullName ?? "", LastUpdateFullName = FullName ?? "",
}; };
await _contextMetadata.Placements.AddAsync(placement); await _contextMetadata.Placements.AddAsync(placement);
foreach (var candidate in periodExam.Candidate) foreach (var candidate in periodExam.Candidate.Where(x => x.Status == "done"))
{ {
var placementProfile = new PlacementProfile var placementProfile = new PlacementProfile
{ {
@ -1984,7 +1984,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
Round = periodExam.Round == null ? "" : periodExam.Round.ToString(), Round = periodExam.Round == null ? "" : periodExam.Round.ToString(),
Year = (int)(periodExam.Year == null ? 0 : periodExam.Year), Year = (int)(periodExam.Year == null ? 0 : periodExam.Year),
Number = await _context.Disables.AsQueryable().Where(x => x.PeriodExam == periodExam).CountAsync(), Number = await _context.Disables.AsQueryable().Where(x => x.PeriodExam == periodExam).CountAsync(),
PlacementType = await _contextMetadata.PlacementTypes.FirstOrDefaultAsync(x => x.Name.Trim().ToUpper().Contains("ผู้พิการ")) == null ? await _contextMetadata.PlacementTypes.FirstOrDefaultAsync() : await _contextMetadata.PlacementTypes.FirstOrDefaultAsync(x => x.Name.Trim().ToUpper().Contains("ผู้พิการ")), PlacementType = await _contextMetadata.PlacementTypes.FirstOrDefaultAsync(x => x.Name.Trim().ToUpper().Contains("คัดเลือกคนพิการ")) == null ? await _contextMetadata.PlacementTypes.FirstOrDefaultAsync() : await _contextMetadata.PlacementTypes.FirstOrDefaultAsync(x => x.Name.Trim().ToUpper().Contains("คัดเลือกคนพิการ")),
StartDate = DateTime.Now, StartDate = DateTime.Now,
EndDate = DateTime.Now.AddYears(2).AddDays(-1), EndDate = DateTime.Now.AddYears(2).AddDays(-1),
CreatedAt = DateTime.Now, CreatedAt = DateTime.Now,
@ -2017,7 +2017,10 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
var disableScore = await _context.DisableScores.AsQueryable() var disableScore = await _context.DisableScores.AsQueryable()
.Where(x => x.ScoreImport == scoreImport) .Where(x => x.ScoreImport == scoreImport)
.Where(x => x.ExamId == candidate.ExamId) .Where(x => x.ExamId == candidate.ExamId)
.Where(x => x.ExamStatus == "ผ่าน")
.FirstOrDefaultAsync(x => x.ExamId == candidate.ExamId && x.ScoreImport == scoreImport); .FirstOrDefaultAsync(x => x.ExamId == candidate.ExamId && x.ScoreImport == scoreImport);
if (disableScore == null)
continue;
var placementProfile = new PlacementProfile var placementProfile = new PlacementProfile
{ {
Placement = placement, Placement = placement,