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

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m3s
Details

Browse source
This commit is contained in:
harid 2026-03-10 13:18:54 +07:00
commit 41dd23217c
5 changed files with 3217 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Controllers/DisableController.cs
View file

@ -1612,7 +1612,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
// ใช้ dictionary lookup แทน query DB ทีละรอบ // ใช้ dictionary lookup แทน query DB ทีละรอบ
if (!string.IsNullOrEmpty(r.ExamId) && recruitsDict.TryGetValue(r.ExamId, out var recruit)) if (!string.IsNullOrEmpty(r.ExamId) && recruitsDict.TryGetValue(r.ExamId, out var recruit))
{ {
r.CitizenId = workSheet?.Cells[row, 3]?.GetValue<string>(); r.CitizenId = workSheet?.Cells[row, 3]?.GetValue<string>()?.Trim();
// ภาคความรู้ความสามารถที่ใช้เฉพาะตำแหน่ง // ภาคความรู้ความสามารถที่ใช้เฉพาะตำแหน่ง
r.FullA = 200; r.FullA = 200;
@ -1651,6 +1651,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
} }
r.RemarkScore = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 15]?.GetValue<string>()) ? string.Empty : workSheet?.Cells[row, 15]?.GetValue<string>(); r.RemarkScore = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 15]?.GetValue<string>()) ? string.Empty : workSheet?.Cells[row, 15]?.GetValue<string>();
r.ExamAttribute = (workSheet?.Cells[row, 16]?.GetValue<string>()?.Trim() == "ผ่าน") ? "มีคุณสมบัติ" : "ไม่มีคุณสมบัติ";
r.Major = workSheet.Name; r.Major = workSheet.Name;
r.CreatedAt = DateTime.Now; r.CreatedAt = DateTime.Now;
@ -2091,10 +2094,15 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
: "", : "",
examScore = x.score == null ? 0.0 : x.score.TotalScore, examScore = x.score == null ? 0.0 : x.score.TotalScore,
examResult = x.score == null ? "" : x.score.ExamStatus, examResult = x.score == null ? "" : x.score.ExamStatus,
examAttribute = x.disable.Certificates.Any() && x.disable.Certificates.First().IssueDate != null //examAttribute = x.disable.Certificates.Any() && x.disable.Certificates.First().IssueDate != null
? _disableService.CheckValidCertificate(x.disable.Certificates.First().IssueDate, 5) // ? _disableService.CheckValidCertificate(x.disable.Certificates.First().IssueDate, 5)
? "มีคุณสมบัติ" : "ไม่มีคุณสมบัติ" // ? "มีคุณสมบัติ" : "ไม่มีคุณสมบัติ"
: "ไม่มีคุณสมบัติ", // : "ไม่มีคุณสมบัติ",
examAttribute = x.score == null
? "ไม่มีคุณสมบัติ"
: string.IsNullOrEmpty(x.score.ExamAttribute)
? "ไม่มีคุณสมบัติ"
: x.score.ExamAttribute,
remark = x.disable.Remark, remark = x.disable.Remark,
isSpecial = x.disable.Isspecial == "Y" ? x.disable.Isspecial : "", isSpecial = x.disable.Isspecial == "Y" ? x.disable.Isspecial : "",
applyDate = x.disable.ApplyDate.HasValue && x.disable.ApplyDate.Value != DateTime.MinValue applyDate = x.disable.ApplyDate.HasValue && x.disable.ApplyDate.Value != DateTime.MinValue
@ -2214,11 +2222,16 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
: "" : ""
: "", : "",
ExamResult = sr == null ? "" : sr.ExamStatus, ExamResult = sr == null ? "" : sr.ExamStatus,
ExamAttribute = p.Certificates.Count > 0 ? // ExamAttribute = p.Certificates.Count > 0 ?
_disableService.CheckValidCertificate(p.Certificates.First().IssueDate, 5) // _disableService.CheckValidCertificate(p.Certificates.First().IssueDate, 5)
? "มีคุณสมบัติ" // ? "มีคุณสมบัติ"
: "ไม่มีคุณสมบัติ" // : "ไม่มีคุณสมบัติ"
: "ไม่มีคุณสมบัติ", // : "ไม่มีคุณสมบัติ",
ExamAttribute = sr == null
? "ไม่มีคุณสมบัติ"
: string.IsNullOrEmpty(sr.ExamAttribute)
? "ไม่มีคุณสมบัติ"
: sr.ExamAttribute,
IsSpecial = p.Isspecial, IsSpecial = p.Isspecial,
Remark = p.Remark, Remark = p.Remark,
University = p.Educations.First().University, University = p.Educations.First().University,

6
Data/Migrations/ApplicationDbContextModelSnapshot.cs
View file

@ -1883,6 +1883,12 @@ namespace BMA.EHR.Recurit.Exam.Service.Data.Migrations
.HasColumnOrder(101) .HasColumnOrder(101)
.HasComment("User Id ที่สร้างข้อมูล"); .HasComment("User Id ที่สร้างข้อมูล");
b.Property<string>("ExamAttribute")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasComment("สถานะคัดกรองคุณสมบัติ");
b.Property<string>("ExamId") b.Property<string>("ExamId")
.IsRequired() .IsRequired()
.HasMaxLength(50) .HasMaxLength(50)

3153
Migrations/20260310044710_update_table_DisableScore_add_field_ExamAttribute.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

32
Migrations/20260310044710_update_table_DisableScore_add_field_ExamAttribute.cs Normal file
View file

@ -0,0 +1,32 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Recurit.Exam.Service.Migrations
{
/// <inheritdoc />
public partial class update_table_DisableScore_add_field_ExamAttribute : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "ExamAttribute",
table: "DisableScores",
type: "varchar(50)",
maxLength: 50,
nullable: false,
defaultValue: "",
comment: "สถานะคัดกรองคุณสมบัติ")
.Annotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ExamAttribute",
table: "DisableScores");
}
}
}

3
Models/Disable/DisableScore.cs
View file

@ -80,6 +80,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Models.Disables
[Comment("หมายเหตุจากลำดับที่สอบได้")] [Comment("หมายเหตุจากลำดับที่สอบได้")]
public string RemarkExamOrder { get; set; } = string.Empty; public string RemarkExamOrder { get; set; } = string.Empty;
[MaxLength(50), Comment("สถานะคัดกรองคุณสมบัติ")]
public string ExamAttribute { get; set; } = string.Empty;
public ScoreImport ScoreImport { get; set; } public ScoreImport ScoreImport { get; set; }
} }
} }