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

8
Services/CandidateService.cs
View file

@ -2480,7 +2480,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
Number = candidate.Number,
ReviewPoint = candidate.ReviewPoint,
Review = candidate.Review,
AnnouncementDate = exam.AnnouncementDate?.AddYears(2),
// เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
//AnnouncementDate = exam.AnnouncementDate?.AddYears(2),
AnnouncementDate = exam.ScoreExpireDate,
Id = candidate.Id,
Position = positionName,
PositionLevel = positionLevelName,
@ -2540,7 +2542,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
Number = candidate.Number,
ReviewPoint = candidate.ReviewPoint,
Review = candidate.Review,
AnnouncementDate = candidate.PeriodExam?.AnnouncementDate?.AddYears(2),
// เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
//AnnouncementDate = candidate.PeriodExam?.AnnouncementDate?.AddYears(2),
AnnouncementDate = candidate.PeriodExam?.ScoreExpireDate,
Id = candidate.Id,
Position = positionName,
PositionLevel = positionLevelName,

141
Services/PeriodExamService.cs
View file

@ -11,6 +11,7 @@ using Microsoft.EntityFrameworkCore;
using OfficeOpenXml;
using OfficeOpenXml.Style;
using System.Text;
using System.Text.RegularExpressions;
using Newtonsoft.Json;
using System.Net.Http.Headers;
@ -108,6 +109,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
AnnouncementEndDate = x.AnnouncementEndDate,
AnnouncementStartDate = x.AnnouncementStartDate,
AnnouncementDate = x.AnnouncementDate,
ScoreExpireDate = x.ScoreExpireDate,
CheckDisability = x.CheckDisability,
CheckDocument = x.CheckDocument,
Detail = x.Detail,
@ -157,6 +159,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
AnnouncementEndDate = x.AnnouncementEndDate,
AnnouncementStartDate = x.AnnouncementStartDate,
AnnouncementDate = x.AnnouncementDate,
ScoreExpireDate = x.ScoreExpireDate,
CheckDisability = x.CheckDisability,
CheckDocument = x.CheckDocument,
Detail = x.Detail,
@ -352,6 +355,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
PaymentEndDate = inserted.PaymentEndDate,
AnnouncementStartDate = inserted.AnnouncementStartDate,
AnnouncementDate = inserted.AnnouncementDate,
ScoreExpireDate = inserted.ScoreExpireDate,
ExamDate = inserted.ExamDate,
AnnouncementEndDate = inserted.AnnouncementEndDate,
OrganizationCodeId = inserted.OrganizationCodeId,
@ -454,6 +458,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
periodExam.PaymentEndDate = updated.PaymentEndDate;
periodExam.AnnouncementStartDate = updated.AnnouncementStartDate;
periodExam.AnnouncementDate = updated.AnnouncementDate;
// ScoreExpireDate อัปเดตเฉพาะเมื่อ FE ส่งค่ามาเท่านั้น (ไม่บังคับส่ง)
if (updated.ScoreExpireDate.HasValue)
periodExam.ScoreExpireDate = updated.ScoreExpireDate;
periodExam.ExamDate = updated.ExamDate;
periodExam.AnnouncementEndDate = updated.AnnouncementEndDate;
periodExam.OrganizationCodeId = updated.OrganizationCodeId;
@ -1149,19 +1156,19 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
PointPath1A = worksheet.Cells[row, 9].Value != null ? worksheet.Cells[row, 9].Value.ToString() : null,
PointPath2A = worksheet.Cells[row, 10].Value != null ? worksheet.Cells[row, 10].Value.ToString() : null,
PointPath3A = worksheet.Cells[row, 11].Value != null ? worksheet.Cells[row, 11].Value.ToString() : null,
PointTotalA = worksheet.Cells[3, 12].Value != null ? worksheet.Cells[3, 12].Value.ToString()?.Split(" ")[0] : null,
PointTotalA = worksheet.Cells[3, 12].Value != null ? ExtractFirstNumber(worksheet.Cells[3, 12].Value.ToString()) : null,
PointA = worksheet.Cells[row, 12].Value != null ? worksheet.Cells[row, 12].Value.ToString() : null,
PointPerA = worksheet.Cells[row, 13].Value != null ? worksheet.Cells[row, 13].Value.ToString() : null,
ResultA = worksheet.Cells[row, 14].Value != null ? worksheet.Cells[row, 14].Value.ToString() : null,
PointTotalB = worksheet.Cells[3, 15].Value != null ? worksheet.Cells[3, 15].Value.ToString()?.Split(" ")[0] : null,
PointTotalB = worksheet.Cells[3, 15].Value != null ? ExtractFirstNumber(worksheet.Cells[3, 15].Value.ToString()) : null,
PointB = worksheet.Cells[row, 15].Value != null ? worksheet.Cells[row, 15].Value.ToString() : null,
PointPerB = worksheet.Cells[row, 16].Value != null ? worksheet.Cells[row, 16].Value.ToString() : null,
ResultB = worksheet.Cells[row, 17].Value != null ? worksheet.Cells[row, 17].Value.ToString() : null,
PointPath1C = worksheet.Cells[row, 18].Value != null ? worksheet.Cells[row, 18].Value.ToString() : null,
PointPath2C = worksheet.Cells[row, 19].Value != null ? worksheet.Cells[row, 19].Value.ToString() : null,
PointTotalC = worksheet.Cells[3, 20].Value != null ? worksheet.Cells[3, 20].Value.ToString()?.Split(" ")[0] : null,
PointTotalC = worksheet.Cells[3, 20].Value != null ? ExtractFirstNumber(worksheet.Cells[3, 20].Value.ToString()) : null,
PointC = worksheet.Cells[row, 20].Value != null ? worksheet.Cells[row, 20].Value.ToString() : null,
PointPerC = worksheet.Cells[row, 21].Value != null ? worksheet.Cells[row, 21].Value.ToString() : null,
ResultC = worksheet.Cells[row, 22].Value != null ? worksheet.Cells[row, 22].Value.ToString() : null,
@ -1175,14 +1182,14 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
if (!int.TryParse(worksheet.Cells[row, 11].Value != null ? worksheet.Cells[row, 11].Value.ToString() : "0", out _))
throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
if (!int.TryParse(worksheet.Cells[3, 12].Value != null ? worksheet.Cells[3, 12].Value.ToString()?.Split(" ")[0] : "0", out _))
throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[3, 12].Value?.ToString()) ?? "0", out _))
throw new Exception("รูปแบบคะแนนรวมไม่ถูกต้อง กรุณากรอกเป็นตัวเลข (คอลัมน์ L)");
if (!int.TryParse(worksheet.Cells[row, 12].Value != null ? worksheet.Cells[row, 12].Value.ToString() : "0", out _))
throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
if (!int.TryParse(worksheet.Cells[row, 13].Value != null ? worksheet.Cells[row, 13].Value.ToString() : "0", out _))
throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
if (!int.TryParse(worksheet.Cells[3, 15].Value != null ? worksheet.Cells[3, 15].Value.ToString()?.Split(" ")[0] : "0", out _))
throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[3, 15].Value?.ToString()) ?? "0", out _))
throw new Exception("รูปแบบคะแนนรวมไม่ถูกต้อง กรุณากรอกเป็นตัวเลข (คอลัมน์ O)");
if (!int.TryParse(worksheet.Cells[row, 15].Value != null ? worksheet.Cells[row, 15].Value.ToString() : "0", out _))
throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
if (!int.TryParse(worksheet.Cells[row, 16].Value != null ? worksheet.Cells[row, 16].Value.ToString() : "0", out _))
@ -1191,8 +1198,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
if (!int.TryParse(worksheet.Cells[row, 19].Value != null ? worksheet.Cells[row, 19].Value.ToString() : "0", out _))
throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
if (!int.TryParse(worksheet.Cells[3, 20].Value != null ? worksheet.Cells[3, 20].Value.ToString()?.Split(" ")[0] : "0", out _))
throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[3, 20].Value?.ToString()) ?? "0", out _))
throw new Exception("รูปแบบคะแนนรวมไม่ถูกต้อง กรุณากรอกเป็นตัวเลข (คอลัมน์ T)");
if (!int.TryParse(worksheet.Cells[row, 20].Value != null ? worksheet.Cells[row, 20].Value.ToString() : "0", out _))
throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
if (!int.TryParse(worksheet.Cells[row, 21].Value != null ? worksheet.Cells[row, 21].Value.ToString() : "0", out _))
@ -1205,6 +1212,20 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
return list;
}
/// <summary>
/// ดึงเฉพาะส่วนตัวเลขนำหน้าจากค่าในเซลล์คะแนน
/// เช่น "100 คะแนน" / "100คะแนน" / " 100 " -> "100"
/// รองรับทั้งกรณีมี/ไม่มีช่องว่างคั่น หากเซลล์ว่างจะคืน null (เพื่อเก็บ NULL ใน DB)
/// หมายเหตุ: จุดที่ใช้ตรวจสอบ (validation) ต้องใส่ ?? "0" เพื่อให้ค่าว่างผ่านการตรวจ
/// </summary>
private static string? ExtractFirstNumber(string? raw)
{
if (string.IsNullOrWhiteSpace(raw))
return null;
var match = Regex.Match(raw, @"^\s*\d+");
return match.Success ? match.Value : raw.Trim();
}
public async Task UploadSeatCandidateAsync(string examId, IFormFile excels)
{
var periodExam = await _context.PeriodExams.AsQueryable()
@ -1570,35 +1591,35 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
_data.Add(new
{
Number = item.Number != null ? item.Number.ToString() : "",
ExamIdenNumber = item.ExamIdenNumber != null ? item.ExamIdenNumber.ToString() : "-",
CitizenId = item.CitizenId != null ? item.CitizenId.ToString() : "-",
SeatNumber = item.SeatNumber != null ? item.SeatNumber.ToString() : "-",
PrefixName = item.PrefixName != null ? item.PrefixName.ToString() : "-",
FullName = item.FirstName != null && item.LastName != null ? $"{item.FirstName} {item.LastName}" : "-",
PositionName = item.PositionExam != null && item.PositionExam?.PositionName != null ? item.PositionExam?.PositionName.ToString() : "-",
PositionLevelName = item.PositionExam != null && item.PositionExam?.PositionLevelName != null ? item.PositionExam?.PositionLevelName.ToString() : "-",
ExamIdenNumber = item.ExamIdenNumber != null ? item.ExamIdenNumber.ToString() : "",
CitizenId = item.CitizenId != null ? item.CitizenId.ToString() : "",
SeatNumber = item.SeatNumber != null ? item.SeatNumber.ToString() : "",
PrefixName = item.PrefixName != null ? item.PrefixName.ToString() : "",
FullName = item.FirstName != null && item.LastName != null ? $"{item.FirstName} {item.LastName}" : "",
PositionName = item.PositionExam != null && item.PositionExam?.PositionName != null ? item.PositionExam?.PositionName.ToString() : "",
PositionLevelName = item.PositionExam != null && item.PositionExam?.PositionLevelName != null ? item.PositionExam?.PositionLevelName.ToString() : "",
PointPath1A = item.PointPath1A != null ? item.PointPath1A.ToString() : "0",
PointPath2A = item.PointPath2A != null ? item.PointPath2A.ToString() : "0",
PointPath3A = item.PointPath3A != null ? item.PointPath3A.ToString() : "0",
PointA = item.PointA != null ? item.PointA.ToString() : "0",
PointPerA = item.PointPerA != null ? item.PointPerA.ToString() : "0",
ResultA = item.ResultA != null ? item.ResultA.ToString() : "-",
PointPath1A = item.PointPath1A != null ? item.PointPath1A.ToString() : "",
PointPath2A = item.PointPath2A != null ? item.PointPath2A.ToString() : "",
PointPath3A = item.PointPath3A != null ? item.PointPath3A.ToString() : "",
PointA = item.PointA != null ? item.PointA.ToString() : "",
PointPerA = item.PointPerA != null ? item.PointPerA.ToString() : "",
ResultA = item.ResultA != null ? item.ResultA.ToString() : "",
PointB = item.PointB != null ? item.PointB.ToString() : "0",
PointPerB = item.PointPerB != null ? item.PointPerB.ToString() : "0",
ResultB = item.ResultB != null ? item.ResultB.ToString() : "-",
PointB = item.PointB != null ? item.PointB.ToString() : "",
PointPerB = item.PointPerB != null ? item.PointPerB.ToString() : "",
ResultB = item.ResultB != null ? item.ResultB.ToString() : "",
PointPath1C = item.PointPath1C != null ? item.PointPath1C.ToString() : "0",
PointPath2C = item.PointPath2C != null ? item.PointPath2C.ToString() : "0",
PointC = item.PointC != null ? item.PointC.ToString() : "0",
PointPerC = item.PointPerC != null ? item.PointPerC.ToString() : "0",
ResultC = item.ResultC != null ? item.ResultC.ToString() : "-",
PointPath1C = item.PointPath1C != null ? item.PointPath1C.ToString() : "",
PointPath2C = item.PointPath2C != null ? item.PointPath2C.ToString() : "",
PointC = item.PointC != null ? item.PointC.ToString() : "",
PointPerC = item.PointPerC != null ? item.PointPerC.ToString() : "",
ResultC = item.ResultC != null ? item.ResultC.ToString() : "",
Pass = item.Pass != null ? item.Pass.ToString() : "-",
Pass = item.Pass != null ? item.Pass.ToString() : "",
PaymentStatus = item.PeriodExam == null || item.PeriodExam.Fee <= 0 ? "ไม่มีชำระเงิน" : (item.PaymentDate == null ? "ยังไม่ชำระเงิน" : "ชำระแล้ว"),
PaymentDate = item.PaymentDate == null ? "" : $"{item.PaymentDate.Value.ToThaiShortDate()} {item.PaymentDate.Value:HH:mm:ss.ffff}".ToString(),
RegisterDate = item.RegisterDate == null ? "-" : $"{item.RegisterDate.Value.ToThaiShortDate()} {item.RegisterDate.Value:HH:mm:ss.ffff}".ToString(),
RegisterDate = item.RegisterDate == null ? "" : $"{item.RegisterDate.Value.ToThaiShortDate()} {item.RegisterDate.Value:HH:mm:ss.ffff}".ToString(),
ExamReason = item.ExamReason != null ? item.ExamReason.ToString() : ""
});
}
@ -1608,35 +1629,35 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
_data.Add(new
{
Number = "",
ExamIdenNumber = "-",
CitizenId = "-",
SeatNumber = "-",
PrefixName = "-",
FullName = "-",
PositionName = "-",
PositionLevelName = "-",
ExamIdenNumber = "",
CitizenId = "",
SeatNumber = "",
PrefixName = "",
FullName = "",
PositionName = "",
PositionLevelName = "",
PointPath1A = "-",
PointPath2A = "-",
PointPath3A = "-",
PointA = "-",
PointPerA = "-",
ResultA = "-",
PointPath1A = "",
PointPath2A = "",
PointPath3A = "",
PointA = "",
PointPerA = "",
ResultA = "",
PointB = "-",
PointPerB = "-",
ResultB = "-",
PointB = "",
PointPerB = "",
ResultB = "",
PointPath1C = "-",
PointPath2C = "-",
PointC = "-",
PointPerC = "-",
ResultC = "-",
PointPath1C = "",
PointPath2C = "",
PointC = "",
PointPerC = "",
ResultC = "",
Pass = "-",
PaymentStatus = "-",
Pass = "",
PaymentStatus = "",
PaymentDate = "",
RegisterDate = "-",
RegisterDate = "",
ExamReason = ""
});
}
@ -2965,7 +2986,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
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("สอบคัดเลือก")),
StartDate = DateTime.Now,
EndDate = DateTime.Now.AddYears(2).AddDays(-1),
// เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
//EndDate = DateTime.Now.AddYears(2).AddDays(-1),
EndDate = periodExam.ScoreExpireDate ?? DateTime.Now.AddYears(2).AddDays(-1),
CreatedAt = DateTime.Now,
CreatedUserId = UserId ?? "",
CreatedFullName = FullName ?? "",
@ -3197,7 +3220,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
Number = await _context.Disables.AsQueryable().Where(x => x.PeriodExam == periodExam).CountAsync(),
PlacementType = placementTypesCache.FirstOrDefault(x => x.Name.Trim().ToUpper().Contains("คัดเลือกอื่นๆ")) ?? placementTypesCache.First(),
StartDate = accountStartDate,
EndDate = accountStartDate.AddYears(2).AddDays(-1),
// เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
//EndDate = accountStartDate.AddYears(2).AddDays(-1),
EndDate = periodExam.ScoreExpireDate ?? accountStartDate.AddYears(2).AddDays(-1),
CreatedAt = DateTime.Now,
CreatedUserId = UserId ?? "",
CreatedFullName = FullName ?? "",