แก้ model สอบคัดเลือก
This commit is contained in:
Kittapath
parent
5456eda96f
commit
4fb8439968
6 changed files with 131 additions and 63 deletions
|
|
@ -123,7 +123,7 @@ namespace BMA.EHR.Report.Service.Controllers
|
|||
Year = (p.PeriodExam.Year.Value.ToThaiYear().ToString()),
|
||||
FullName = $"{p.Prefix}{p.FirstName} {p.LastName}",
|
||||
ExamResult = sr == null ? "" : sr.ExamStatus,
|
||||
EndDate = (p.PeriodExam.RegisterEndDate.ToThaiFullDate3()),
|
||||
EndDate = p.PeriodExam.RegisterEndDate == null ? "" : (p.PeriodExam.RegisterEndDate.Value.ToThaiFullDate3()),
|
||||
AuthName = "นายณัฐพงศ์ ดิษยบุตร",
|
||||
AuthPosition = "หัวหน้าสำนักงาน ก.ก."
|
||||
})
|
||||
|
|
@ -206,7 +206,7 @@ namespace BMA.EHR.Report.Service.Controllers
|
|||
Number = sr == null ? "" : (sr.Number),
|
||||
// ExamCount = 10,
|
||||
// ExamCount = GetExamCountTes(p.CitizenId),
|
||||
ScoreExpire = p.PeriodExam.AnnouncementDate == null ? "" : (p.PeriodExam.AnnouncementDate.AddYears(2).ToThaiShortDate()),
|
||||
ScoreExpire = p.PeriodExam.AnnouncementDate == null ? "" : (p.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate()),
|
||||
FullA = sr == null ? "๐" : (sr.FullA.ToString()),
|
||||
SumA = sr == null ? "๐" : (sr.SumA.ToString()),
|
||||
FullB = sr == null ? "๐" : (sr.FullB.ToString()),
|
||||
|
|
|
|||
|
|
@ -25,21 +25,54 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
|
|||
[Comment("เลขที่นั่งสอบ")]
|
||||
public string? SeatNumber { get; set; }
|
||||
|
||||
[Comment("คะแนนเต็มภาค ก")]
|
||||
public string? PointTotalA { get; set; }
|
||||
|
||||
[Comment("คะแนนภาค ก ความสามารถในการคิดวิเคราะห์")]
|
||||
public string? PointPath1A { get; set; }
|
||||
|
||||
[Comment("คะแนนภาค ก ภาษาอังกฤษ")]
|
||||
public string? PointPath2A { get; set; }
|
||||
|
||||
[Comment("คะแนนภาค ก ความรู้และลักษณะการเป็นข้าราชการที่ดี")]
|
||||
public string? PointPath3A { get; set; }
|
||||
|
||||
[Comment("คะแนนภาค ก")]
|
||||
public string? PointA { get; set; }
|
||||
|
||||
[Comment("คะแนนภาค ก เปอร์เซนต์")]
|
||||
public string? PointPerA { get; set; }
|
||||
|
||||
[Comment("ผลสอบภาค ก")]
|
||||
public string? ResultA { get; set; }
|
||||
|
||||
[Comment("คะแนนเต็มภาค ข")]
|
||||
public string? PointTotalB { get; set; }
|
||||
|
||||
[Comment("คะแนนภาค ข")]
|
||||
public string? PointB { get; set; }
|
||||
|
||||
[Comment("คะแนนภาค ข เปอร์เซนต์")]
|
||||
public string? PointPerB { get; set; }
|
||||
|
||||
[Comment("ผลสอบภาค ข")]
|
||||
public string? ResultB { get; set; }
|
||||
|
||||
[Comment("คะแนนเต็มภาค ค")]
|
||||
public string? PointTotalC { get; set; }
|
||||
|
||||
[Comment("คะแนนภาค คทดสอบสมรรถนะหลัก")]
|
||||
public string? PointPath1C { get; set; }
|
||||
|
||||
[Comment("คะแนนภาค ค สัมภาษณ์")]
|
||||
public string? PointPath2C { get; set; }
|
||||
|
||||
[Comment("คะแนนภาค ค")]
|
||||
public string? PointC { get; set; }
|
||||
|
||||
[Comment("คะแนนภาค ค เปอร์เซนต์")]
|
||||
public string? PointPerC { get; set; }
|
||||
|
||||
[Comment("ผลสอบภาค ค")]
|
||||
public string? ResultC { get; set; }
|
||||
|
||||
|
|
@ -77,6 +110,12 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
|
|||
[Comment("สถานภาพ")]
|
||||
public string? RelationshipName { get; set; }
|
||||
|
||||
[Comment("Id ศาสนา")]
|
||||
public Guid? ReligionId { get; set; }
|
||||
|
||||
[Comment("ศาสนา")]
|
||||
public string? ReligionName { get; set; }
|
||||
|
||||
[MaxLength(200), Comment("อีเมล")]
|
||||
public string? Email { get; set; }
|
||||
|
||||
|
|
@ -220,24 +259,20 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
|
|||
[MaxLength(100), Comment("สัญชาติมารดา")]
|
||||
public string? MotherNationality { get; set; }
|
||||
|
||||
|
||||
|
||||
[Comment("ประเภทอาชีพที่ทำงานมาก่อน")]
|
||||
public string? OccupationType { get; set; }
|
||||
|
||||
[Comment("ตำแหน่งอาชีพ")]
|
||||
[Comment("ตำแหน่งปัจจุบัน ชื่อตำแหน่ง")]
|
||||
public string? OccupationOrg { get; set; }
|
||||
[Comment("ตำแหน่งปัจจุบัน กอง")]
|
||||
public string? OccupationPile { get; set; }
|
||||
[Comment("ตำแหน่งปัจจุบัน กลุ่ม/ฝ่าย")]
|
||||
public string? OccupationGroup { get; set; }
|
||||
[Comment("ตำแหน่งปัจจุบัน เงินเดือน")]
|
||||
public int? OccupationSalary { get; set; }
|
||||
[Comment("ตำแหน่งปัจจุบัน สังกัด")]
|
||||
public string? OccupationPosition { get; set; }
|
||||
[Comment("ตำแหน่งปัจจุบัน ประเภทราชการ")]
|
||||
public string? OccupationPositionType { get; set; }
|
||||
|
||||
[Comment("สำนัก/บริษัท บริษัท")]
|
||||
public string? OccupationCompany { get; set; }
|
||||
|
||||
[Comment("กอง/ฝ่าย บริษัท")]
|
||||
public string? OccupationDepartment { get; set; }
|
||||
|
||||
[MaxLength(200), Comment("อีเมล บริษัท")]
|
||||
public string? OccupationEmail { get; set; }
|
||||
|
||||
[MaxLength(20), Comment("โทรศัพท์ บริษัท")]
|
||||
[MaxLength(20), Comment("ตำแหน่งปัจจุบัน เบอร์โทรที่ทำงาน")]
|
||||
public string? OccupationTelephone { get; set; }
|
||||
|
||||
[Comment("เหตุผลการไม่อนุมัติ")]
|
||||
|
|
@ -246,11 +281,21 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
|
|||
[Comment("ผลสมัครสอบ")]
|
||||
public string? Pass { get; set; }
|
||||
|
||||
[Comment("หมายเหตุ")]
|
||||
public string? ExamReason { get; set; }
|
||||
|
||||
[Comment("คะแนนความพึงพอใจ")]
|
||||
public int? ReviewPoint { get; set; }
|
||||
|
||||
[Comment("ข้อแนะนำ")]
|
||||
public string? Review { get; set; }
|
||||
|
||||
[MaxLength(40), Comment("วันที่สมัคร")]
|
||||
public DateTime? RegisterDate { get; set; }
|
||||
|
||||
[Comment("วันที่ชำระเงิน")]
|
||||
public DateTime? PaymentDate { get; set; }
|
||||
public virtual List<Education> Educations { get; set; } = new List<Education>();
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,17 +6,20 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
|
|||
{
|
||||
public class Career : EntityBase
|
||||
{
|
||||
[Required, Column(Order = 7), Comment("Id ผู้สมัคร")]
|
||||
[Required, Column(Order = 9), Comment("Id ผู้สมัคร")]
|
||||
public virtual Candidate? Candidate { get; set; }
|
||||
|
||||
[Required, Column(Order = 3), Comment("สถานที่ทำงาน/ฝึกงาน")]
|
||||
public string Name { get; set; } = string.Empty;
|
||||
|
||||
[Required, Column(Order = 4), Comment("ตำแหน่ง/ลักษณะงาน")]
|
||||
[Required, Column(Order = 3), Comment("ชื่อตำแหน่ง")]
|
||||
public string Position { get; set; } = string.Empty;
|
||||
|
||||
[Required, MaxLength(20), Column(Order = 5), Comment("เงินเดือนสุดท้ายก่อนออก")]
|
||||
public int Salary { get; set; }
|
||||
[Column(Order = 4), Comment("กลุ่ม/ฝ่าย")]
|
||||
public string? Group { get; set; } = string.Empty;
|
||||
|
||||
[Column(Order = 5), Comment("กอง")]
|
||||
public string? Pile { get; set; } = string.Empty;
|
||||
|
||||
[Column(Order = 6), Comment("สังกัด")]
|
||||
public string? Org { get; set; } = string.Empty;
|
||||
|
||||
[Required, Column(Order = 1), Comment("ระยะเวลาเริ่ม")]
|
||||
public DateTime DurationStart { get; set; } = DateTime.Now.Date;
|
||||
|
|
@ -24,7 +27,10 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
|
|||
[Required, Column(Order = 2), Comment("ระยะเวลาสิ้นสุด")]
|
||||
public DateTime DurationEnd { get; set; } = DateTime.Now.Date;
|
||||
|
||||
[Required, Column(Order = 6), Comment("เหตุผลที่ออก")]
|
||||
public string Reason { get; set; } = string.Empty;
|
||||
[Required, Column(Order = 7), Comment("ระยะเวลา")]
|
||||
public string RangeDate { get; set; } = string.Empty;
|
||||
|
||||
[Required, Column(Order = 8), Comment("ประเภท")]
|
||||
public string Type { get; set; } = string.Empty;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,26 +8,25 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
|
|||
{
|
||||
[Required, Column(Order = 7), Comment("Id ผู้สมัคร")]
|
||||
public virtual Candidate? Candidate { get; set; }
|
||||
|
||||
[Comment("Idวุฒิที่ได้รับ")]
|
||||
public Guid? EducationLevelId { get; set; }
|
||||
|
||||
[Comment("วุฒิที่ได้รับ")]
|
||||
public string? EducationLevelName { get; set; }
|
||||
|
||||
[Required, Column(Order = 4), Comment("สาขาวิชา/วิชาเอก")]
|
||||
public string Major { get; set; } = string.Empty;
|
||||
|
||||
[Required, MaxLength(10), Column(Order = 6), Comment("คะแนนเฉลี่ยตลอดหลักสูตร")]
|
||||
public float Scores { get; set; }
|
||||
|
||||
[Required, Column(Order = 3), Comment("ชื่อสถานศึกษา")]
|
||||
public string Name { get; set; } = string.Empty;
|
||||
|
||||
[Required, Column(Order = 1), Comment("ระยะเวลาเริ่ม")]
|
||||
public DateTime DurationStart { get; set; } = DateTime.Now.Date;
|
||||
|
||||
[Required, Column(Order = 2), Comment("ระยะเวลาสิ้นสุด")]
|
||||
public DateTime DurationEnd { get; set; } = DateTime.Now.Date;
|
||||
[Comment("Id วุฒิที่ใช้สมัครสอบ")]
|
||||
public Guid? EducationLevelExamId { get; set; }
|
||||
[Comment("วุฒิที่ใช้สมัครสอบ")]
|
||||
public string? EducationLevelExamName { get; set; }
|
||||
[Comment("ชื่อปริญญา")]
|
||||
public string? EducationName { get; set; }
|
||||
[Comment("สาขาวิชา/วิชาเอก")]
|
||||
public string? EducationMajor { get; set; }
|
||||
[Comment("ชื่อสถานศึกษา")]
|
||||
public string? EducationLocation { get; set; }
|
||||
[Comment("ประเภทสถานศึกษา")]
|
||||
public string? EducationType { get; set; }
|
||||
[Comment("วันที่สำเร็จการศึกษา")]
|
||||
public DateTime? EducationEndDate { get; set; }
|
||||
[Comment("คะแนนเฉลี่ยสะสม")]
|
||||
public string? EducationScores { get; set; }
|
||||
[Comment("Id วุฒิการศึกษาสูงสุด")]
|
||||
public Guid? EducationLevelHighId { get; set; }
|
||||
[Comment("วุฒิการศึกษาสูงสุด")]
|
||||
public string? EducationLevelHighName { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,20 +26,20 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
|
|||
[Comment("ค่าธรรมเนียม")]
|
||||
public float? Fee { get; set; } = 0;
|
||||
|
||||
[Required, Column(Order = 1), Comment("วันเริ่มสมัครสอบ")]
|
||||
public DateTime RegisterStartDate { get; set; } = DateTime.Now.Date;
|
||||
[Column(Order = 1), Comment("วันเริ่มสมัครสอบ")]
|
||||
public DateTime? RegisterStartDate { get; set; }
|
||||
|
||||
[Required, Column(Order = 2), Comment("วันสิ้นสุดสมัครสอบ")]
|
||||
public DateTime RegisterEndDate { get; set; } = DateTime.Now.Date;
|
||||
[Column(Order = 2), Comment("วันสิ้นสุดสมัครสอบ")]
|
||||
public DateTime? RegisterEndDate { get; set; }
|
||||
|
||||
[Required, Column(Order = 3), Comment("วันเริ่มชำระเงิน")]
|
||||
public DateTime PaymentStartDate { get; set; } = DateTime.Now.Date;
|
||||
[Column(Order = 3), Comment("วันเริ่มชำระเงิน")]
|
||||
public DateTime? PaymentStartDate { get; set; }
|
||||
|
||||
[Required, Column(Order = 4), Comment("วันสิ้นสุดชำระเงิน")]
|
||||
public DateTime PaymentEndDate { get; set; } = DateTime.Now.Date;
|
||||
[Column(Order = 4), Comment("วันสิ้นสุดชำระเงิน")]
|
||||
public DateTime? PaymentEndDate { get; set; }
|
||||
|
||||
[Required, Column(Order = 5), Comment("วันประกาศผลสอบ")]
|
||||
public DateTime AnnouncementDate { get; set; } = DateTime.Now.Date;
|
||||
[Column(Order = 5), Comment("วันประกาศผลสอบ")]
|
||||
public DateTime? AnnouncementDate { get; set; }
|
||||
|
||||
[Required, Column(Order = 6), Comment("วันเริ่มประกาศ")]
|
||||
public DateTime AnnouncementStartDate { get; set; } = DateTime.Now.Date;
|
||||
|
|
@ -47,8 +47,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
|
|||
[Required, Column(Order = 7), Comment("วันสิ้นสุดประกาศ")]
|
||||
public DateTime AnnouncementEndDate { get; set; } = DateTime.Now.Date;
|
||||
|
||||
[Required, Comment("วันที่สอบ")]
|
||||
public DateTime ExamDate { get; set; } = DateTime.Now.Date;
|
||||
[Comment("วันที่สอบ")]
|
||||
public DateTime? ExamDate { get; set; }
|
||||
|
||||
[Comment("Id รหัสส่วนราชการ")]
|
||||
public Guid? OrganizationCodeId { get; set; }
|
||||
|
|
@ -68,6 +68,12 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
|
|||
[Comment("รายละเอียดสมัครสอบ")]
|
||||
public string? Detail { get; set; }
|
||||
|
||||
[Comment("รายละเอียดเงื่อนไขการสมัคร")]
|
||||
public string? EditorCondition { get; set; }
|
||||
|
||||
[Comment("รายละเอียดคำรับรอง")]
|
||||
public string? EditorConfirm { get; set; }
|
||||
|
||||
[Comment("หมายเหตุ")]
|
||||
public string? Note { get; set; }
|
||||
|
||||
|
|
|
|||
|
|
@ -14,10 +14,22 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
|
|||
[Comment("ชื่อตำแหน่ง")]
|
||||
public string? PositionName { get; set; }
|
||||
|
||||
[Comment("Id ระดับ")]
|
||||
public Guid? PositionLevelId { get; set; }
|
||||
|
||||
[Comment("ชื่อระดับ")]
|
||||
public string? PositionLevelName { get; set; }
|
||||
|
||||
[Comment("Id ประเภทแบบฟอร์ม")]
|
||||
public string? TypeId { get; set; }
|
||||
|
||||
[Comment("ชื่อประเภทแบบฟอร์ม")]
|
||||
public string? TypeName { get; set; }
|
||||
|
||||
[Comment("ปริญญาบัตรขึ้นไป")]
|
||||
public bool HighDegree { get; set; }
|
||||
|
||||
[Comment("รหัสประจำตำแหน่งที่สอบ")]
|
||||
public string? Code { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue