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

migrate add ScoreExpireDate

Browse source
This commit is contained in:
harid 2026-07-01 18:15:22 +07:00
parent 57831420f8
commit 536e7e924d
10 changed files with 3310 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Controllers/DisableController.cs
View file

@ -2062,6 +2062,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
case "notpass":
queryWithScores = queryWithScores.Where(x => x.score != null && x.score.ExamStatus == "ไม่ผ่าน");
break;
case "other":
queryWithScores = queryWithScores.Where(x => x.score != null && !new[] { "ขส.", "ผ่าน", "ไม่ผ่าน" }.Contains(x.score.ExamStatus));
break;
}
}
@ -2331,11 +2334,15 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
Score = score == null ? 0.0 : score.TotalScore,
Number = score == null ? "" : score.Number,
ExamCount = _disableService.GetExamCount(disable.CitizenId),
ScoreExpire = disable.PeriodExam.AnnouncementDate == null
// เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
//ScoreExpire = disable.PeriodExam.AnnouncementDate == null
// ? ""
// : disable.PeriodExam.AnnouncementDate != DateTime.MinValue
// ? disable.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate()
// : "",
ScoreExpire = disable.PeriodExam.ScoreExpireDate == null
? ""
: disable.PeriodExam.AnnouncementDate != DateTime.MinValue
? disable.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate()
: "",
: disable.PeriodExam.ScoreExpireDate.Value.ToThaiShortDate(),
typeTest = disable.typeTest,
ScoreResult = score == null ? null : new
{
@ -2687,11 +2694,15 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
T = score != null ? score.TotalScore.ToString().ToThaiNumber() : "",
Result = score != null ? score.ExamStatus : "",
Number = score != null && score.Number != null ? score.Number.ToString().ToThaiNumber() : "",
Expire = disable.PeriodExam.AnnouncementDate == null
// เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
//Expire = disable.PeriodExam.AnnouncementDate == null
// ? ""
// : disable.PeriodExam.AnnouncementDate != DateTime.MinValue
// ? disable.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate().ToString().ToThaiNumber()
// : "",
Expire = disable.PeriodExam.ScoreExpireDate == null
? ""
: disable.PeriodExam.AnnouncementDate != DateTime.MinValue
? disable.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate().ToString().ToThaiNumber()
: "",
: disable.PeriodExam.ScoreExpireDate.Value.ToThaiShortDate().ToString().ToThaiNumber(),
};
var result = new

4
Controllers/DisableReportController.cs
View file

@ -191,7 +191,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
Number = sr == null ? "" : sr.Number,
// ExamCount = 10,
// ExamCount = GetExamCountTes(p.CitizenId),
ScoreExpire = p.PeriodExam.AnnouncementDate == null ? "" : p.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(),
// เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
//ScoreExpire = p.PeriodExam.AnnouncementDate == null ? "" : p.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(),
ScoreExpire = p.PeriodExam.ScoreExpireDate == null ? "" : p.PeriodExam.ScoreExpireDate.Value.ToThaiShortDate(),
FullA = sr == null ? 0 : sr.FullA,
SumA = sr == null ? 0 : sr.SumA,
FullB = sr == null ? 0 : sr.FullB,