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-28 11:44:59 +07:00
parent 2f01961dc5
commit be27aa4d33
14 changed files with 1994 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Services/CMSCandidateService.cs
View file

@ -365,6 +365,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
Start = x.ExamDate.ToString("yyyy-MM-dd"),
End = x.ExamDate.ToString("yyyy-MM-dd"),
ExamDate = x.ExamDate.ToString("yyyy-MM-dd"),
Announcement_date = x.AnnouncementDate.ToString("yyyy-MM-dd"),
Announcement_startDate = x.AnnouncementStartDate.ToString("yyyy-MM-dd"),
Announcement_endDate = x.AnnouncementEndDate.ToString("yyyy-MM-dd"),
AnnouncementExam = x.AnnouncementExam,
@ -409,6 +410,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
Start = x.ExamDate.ToString("yyyy-MM-dd"),
End = x.ExamDate.ToString("yyyy-MM-dd"),
ExamDate = x.ExamDate.ToString("yyyy-MM-dd"),
Announcement_date = x.AnnouncementDate.ToString("yyyy-MM-dd"),
Announcement_startDate = x.AnnouncementStartDate.ToString("yyyy-MM-dd"),
Announcement_endDate = x.AnnouncementEndDate.ToString("yyyy-MM-dd"),
AnnouncementExam = x.AnnouncementExam,
@ -453,6 +455,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
Start = x.AnnouncementStartDate.ToString("yyyy-MM-dd"),
End = x.AnnouncementEndDate.ToString("yyyy-MM-dd"),
ExamDate = x.ExamDate.ToString("yyyy-MM-dd"),
Announcement_date = x.AnnouncementDate.ToString("yyyy-MM-dd"),
Announcement_startDate = x.AnnouncementStartDate.ToString("yyyy-MM-dd"),
Announcement_endDate = x.AnnouncementEndDate.ToString("yyyy-MM-dd"),
AnnouncementExam = x.AnnouncementExam,

3
Services/CandidateService.cs
View file

@ -1898,6 +1898,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
PointC = candidate.PointC,
ResultC = candidate.ResultC,
Pass = candidate.Pass,
AnnouncementDate = exam.AnnouncementDate.AddYears(2),
Id = candidate.Id,
};
}
@ -1906,6 +1907,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
{
var candidate = await _context.Candidates.AsQueryable()
.Include(x => x.ProfileImg)
.Include(x => x.PeriodExam)
.FirstOrDefaultAsync(x => x.Id == Guid.Parse(candidateId));
if (candidate == null)
@ -1927,6 +1929,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
PointC = candidate.PointC,
ResultC = candidate.ResultC,
Pass = candidate.Pass,
AnnouncementDate = candidate.PeriodExam?.AnnouncementDate.AddYears(2),
Id = candidate.Id,
};
}

10
Services/PeriodExamService.cs
View file

@ -63,6 +63,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
ExamDate = x.ExamDate,
AnnouncementEndDate = x.AnnouncementEndDate,
AnnouncementStartDate = x.AnnouncementStartDate,
AnnouncementDate = x.AnnouncementDate,
CheckDisability = x.CheckDisability,
CheckDocument = x.CheckDocument,
Detail = x.Detail,
@ -100,6 +101,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
ExamDate = x.ExamDate,
AnnouncementEndDate = x.AnnouncementEndDate,
AnnouncementStartDate = x.AnnouncementStartDate,
AnnouncementDate = x.AnnouncementDate,
CheckDisability = x.CheckDisability,
CheckDocument = x.CheckDocument,
Detail = x.Detail,
@ -188,6 +190,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
return new RequestStatusExam
{
Name = periodExam.Name,
Round = periodExam.Round,
Year = periodExam.Year,
Status = DateTime.Now > periodExam.PaymentEndDate,
SetSeat = periodExam.SetSeat,
};
@ -207,6 +211,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
return new RequestPositionName
{
Name = periodExam.Name,
Round = periodExam.Round,
Year = periodExam.Year,
Posiiton = periodExam.PositionExam.FirstOrDefault(x => x.Id == Guid.Parse(positionId) && x.PeriodExam == periodExam),
};
}
@ -215,6 +221,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
return new RequestPositionName
{
Name = periodExam.Name,
Round = periodExam.Round,
Year = periodExam.Year,
Posiiton = null,
};
}
@ -235,6 +243,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
PaymentStartDate = inserted.PaymentStartDate,
PaymentEndDate = inserted.PaymentEndDate,
AnnouncementStartDate = inserted.AnnouncementStartDate,
AnnouncementDate = inserted.AnnouncementDate,
ExamDate = inserted.ExamDate,
AnnouncementEndDate = inserted.AnnouncementEndDate,
OrganizationCodeId = inserted.OrganizationCodeId,
@ -324,6 +333,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
periodExam.PaymentStartDate = updated.PaymentStartDate;
periodExam.PaymentEndDate = updated.PaymentEndDate;
periodExam.AnnouncementStartDate = updated.AnnouncementStartDate;
periodExam.AnnouncementDate = updated.AnnouncementDate;
periodExam.ExamDate = updated.ExamDate;
periodExam.AnnouncementEndDate = updated.AnnouncementEndDate;
periodExam.OrganizationCodeId = updated.OrganizationCodeId;