report 1-4 เำิม่หมายเหตุแนวนอน
This commit is contained in:
parent
5530c2f9e4
commit
2da120f958
32 changed files with 51300 additions and 13 deletions
|
|
@ -5,6 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
|
|||
using BMA.EHR.Domain.Models.MetaData;
|
||||
using BMA.EHR.Domain.Models.HR;
|
||||
using BMA.EHR.Domain.Models.Documents;
|
||||
using BMA.EHR.Domain.Models.Organizations;
|
||||
|
||||
namespace BMA.EHR.Domain.Models.Insignias
|
||||
{
|
||||
|
|
@ -46,13 +47,13 @@ namespace BMA.EHR.Domain.Models.Insignias
|
|||
[Comment("หลักฐานรับเครื่องราชฯ")]
|
||||
public Document? DocReceiveInsignia { get; set; }
|
||||
[Comment("หน่วยงานรับเครื่องราชฯ")]
|
||||
public OrganizationOrganization? OrgReceiveInsignia { get; set; }
|
||||
public OrganizationEntity? OrgReceiveInsignia { get; set; }
|
||||
[Comment("วันที่คืนเครื่องราชฯ")]
|
||||
public DateTime? DateReturnInsignia { get; set; }
|
||||
[Comment("หลักฐานคืนเครื่องราชฯ")]
|
||||
public Document? DocReturnInsignia { get; set; }
|
||||
[Comment("หน่วยงานคืนเครื่องราชฯ")]
|
||||
public OrganizationOrganization? OrgReturnInsignia { get; set; }
|
||||
public OrganizationEntity? OrgReturnInsignia { get; set; }
|
||||
public Profile Profile { get; set; }
|
||||
public Insignia RequestInsignia { get; set; }
|
||||
public InsigniaNote InsigniaNote { get; set; }
|
||||
|
|
|
|||
|
|
@ -241,8 +241,15 @@ namespace BMA.EHR.Domain.Models.Placement
|
|||
[Comment("ข้อมูลตำแหน่ง Draft")]
|
||||
public bool? Draft { get; set; }
|
||||
|
||||
[Comment("หมายเหตุแนวตั้ง")]
|
||||
public string? RemarkVertical { get; set; }
|
||||
|
||||
[Comment("หมายเหตุแนวนอน")]
|
||||
public string? RemarkHorizontal { get; set; }
|
||||
|
||||
[Comment("Id รูปโปรไฟล์")]
|
||||
public virtual Document? ProfileImg { get; set; }
|
||||
public virtual List<PlacementProfileDoc> PlacementProfileDocs { get; set; } = new List<PlacementProfileDoc>();
|
||||
public virtual List<PlacementCertificate> PlacementCertificates { get; set; } = new List<PlacementCertificate>();
|
||||
public virtual List<PlacementEducation> PlacementEducations { get; set; } = new List<PlacementEducation>();
|
||||
}
|
||||
|
|
|
|||
15
BMA.EHR.Domain/Models/Placement/PlacementProfileDoc.cs
Normal file
15
BMA.EHR.Domain/Models/Placement/PlacementProfileDoc.cs
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
using BMA.EHR.Domain.Models.Base;
|
||||
using BMA.EHR.Domain.Models.Documents;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace BMA.EHR.Domain.Models.Placement
|
||||
{
|
||||
public class PlacementProfileDoc : EntityBase
|
||||
{
|
||||
[Required, Comment("อ้างอิงรหัสเอกสาร")]
|
||||
public Document Document { get; set; }
|
||||
[Required, Comment("อ้างอิงรับโอน")]
|
||||
public virtual PlacementProfile PlacementProfile { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
@ -9,6 +9,8 @@ namespace BMA.EHR.Domain.Models.Retirement
|
|||
{
|
||||
[Comment("ครั้งที่")]
|
||||
public int Round { get; set; }
|
||||
[Comment("ประกาศ ณ วันที่")]
|
||||
public DateTime? SignDate { get; set; }
|
||||
[Comment("ประเภทคำสั่ง")]
|
||||
public string? TypeReport { get; set; } = string.Empty;
|
||||
[Comment("ปีงบประมาณ")]
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ namespace BMA.EHR.Domain.Models.Retirement
|
|||
{
|
||||
[Comment("ครั้งที่")]
|
||||
public int Round { get; set; }
|
||||
[Comment("ประกาศ ณ วันที่")]
|
||||
public DateTime? SignDate { get; set; }
|
||||
[Comment("ประเภทคำสั่ง")]
|
||||
public string? TypeReport { get; set; } = string.Empty;
|
||||
[Comment("ปีงบประมาณ")]
|
||||
|
|
|
|||
|
|
@ -45,5 +45,30 @@ namespace BMA.EHR.Domain.Models.Retirement
|
|||
public string? Suggestion { get; set; }
|
||||
[Comment("กําหนดวันนัดหมายเพื่อทําการสัมภาษณ์การลาออก")]
|
||||
public DateTime? AppointDate { get; set; }
|
||||
|
||||
[Comment("คะแนนข้อ 1")]
|
||||
public int? Score1 { get; set; }
|
||||
[Comment("คะแนนข้อ 2")]
|
||||
public int? Score2 { get; set; }
|
||||
[Comment("คะแนนข้อ 3")]
|
||||
public int? Score3 { get; set; }
|
||||
[Comment("คะแนนข้อ 4")]
|
||||
public int? Score4 { get; set; }
|
||||
[Comment("คะแนนข้อ 5")]
|
||||
public int? Score5 { get; set; }
|
||||
[Comment("คะแนนข้อ 6")]
|
||||
public int? Score6 { get; set; }
|
||||
[Comment("คะแนนข้อ 7")]
|
||||
public int? Score7 { get; set; }
|
||||
[Comment("คะแนนข้อ 8")]
|
||||
public int? Score8 { get; set; }
|
||||
[Comment("คะแนนข้อ 9")]
|
||||
public int? Score9 { get; set; }
|
||||
[Comment("คะแนนข้อ 10")]
|
||||
public int? Score10 { get; set; }
|
||||
[Comment("คะแนนรวม")]
|
||||
public int? ScoreTotal { get; set; }
|
||||
[Comment("ความคิดเห็น")]
|
||||
public string? Comment { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,82 @@
|
|||
using Microsoft.EntityFrameworkCore;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using BMA.EHR.Domain.Models.Base;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using BMA.EHR.Domain.Models.Documents;
|
||||
using BMA.EHR.Domain.Models.MetaData;
|
||||
|
||||
namespace BMA.EHR.Domain.Models.Retirement
|
||||
{
|
||||
public class RetirementQuestionnaireQuestion : EntityBase
|
||||
{
|
||||
[Comment("คำถามข้อที่ 1")]
|
||||
public string? Question1Desc { get; set; }
|
||||
[Comment("คำตอบข้อที่ 1")]
|
||||
public string? Question1Score { get; set; }
|
||||
[Comment("กรอกคะแนน 1")]
|
||||
public string? Question1Answer { get; set; }
|
||||
|
||||
[Comment("คำถามข้อที่ 2")]
|
||||
public string? Question2Desc { get; set; }
|
||||
[Comment("คำตอบข้อที่ 2")]
|
||||
public string? Question2Score { get; set; }
|
||||
[Comment("กรอกคะแนน 2")]
|
||||
public string? Question2Answer { get; set; }
|
||||
|
||||
[Comment("คำถามข้อที่ 3")]
|
||||
public string? Question3Desc { get; set; }
|
||||
[Comment("คำตอบข้อที่ 3")]
|
||||
public string? Question3Score { get; set; }
|
||||
[Comment("กรอกคะแนน 3")]
|
||||
public string? Question3Answer { get; set; }
|
||||
|
||||
[Comment("คำถามข้อที่ 4")]
|
||||
public string? Question4Desc { get; set; }
|
||||
[Comment("คำตอบข้อที่ 4")]
|
||||
public string? Question4Score { get; set; }
|
||||
[Comment("กรอกคะแนน 4")]
|
||||
public string? Question4Answer { get; set; }
|
||||
|
||||
[Comment("คำถามข้อที่ 5")]
|
||||
public string? Question5Desc { get; set; }
|
||||
[Comment("คำตอบข้อที่ 5")]
|
||||
public string? Question5Score { get; set; }
|
||||
[Comment("กรอกคะแนน 5")]
|
||||
public string? Question5Answer { get; set; }
|
||||
|
||||
[Comment("คำถามข้อที่ 6")]
|
||||
public string? Question6Desc { get; set; }
|
||||
[Comment("คำตอบข้อที่ 6")]
|
||||
public string? Question6Score { get; set; }
|
||||
[Comment("กรอกคะแนน 6")]
|
||||
public string? Question6Answer { get; set; }
|
||||
|
||||
[Comment("คำถามข้อที่ 7")]
|
||||
public string? Question7Desc { get; set; }
|
||||
[Comment("คำตอบข้อที่ 7")]
|
||||
public string? Question7Score { get; set; }
|
||||
[Comment("กรอกคะแนน 7")]
|
||||
public string? Question7Answer { get; set; }
|
||||
|
||||
[Comment("คำถามข้อที่ 8")]
|
||||
public string? Question8Desc { get; set; }
|
||||
[Comment("คำตอบข้อที่ 8")]
|
||||
public string? Question8Score { get; set; }
|
||||
[Comment("กรอกคะแนน 8")]
|
||||
public string? Question8Answer { get; set; }
|
||||
|
||||
[Comment("คำถามข้อที่ 9")]
|
||||
public string? Question9Desc { get; set; }
|
||||
[Comment("คำตอบข้อที่ 9")]
|
||||
public string? Question9Score { get; set; }
|
||||
[Comment("กรอกคะแนน 9")]
|
||||
public string? Question9Answer { get; set; }
|
||||
|
||||
[Comment("คำถามข้อที่ 10")]
|
||||
public string? Question10Desc { get; set; }
|
||||
[Comment("คำตอบข้อที่ 10")]
|
||||
public string? Question10Score { get; set; }
|
||||
[Comment("กรอกคะแนน 10")]
|
||||
public string? Question10Answer { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
@ -55,6 +55,8 @@ namespace BMA.EHR.Domain.Models.Retirement
|
|||
public string? CommanderRejectReason { get; set; }
|
||||
[Comment("วันที่ยับยั้งผู้บังคับบัญชา")]
|
||||
public DateTime? CommanderRejectDate { get; set; }
|
||||
[Comment("หมายเหตุแนวนอน")]
|
||||
public string? RemarkHorizontal { get; set; }
|
||||
|
||||
public virtual List<RetirementResignDoc> RetirementResignDocs { get; set; } = new List<RetirementResignDoc>();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,6 +107,7 @@
|
|||
public static readonly string RetirementOtherNotFound = "ไม่พบข้อมูลอื่นๆ";
|
||||
public static readonly string RetirementOutNotFound = "ไม่พบข้อมูลให้ออก";
|
||||
public static readonly string RetirementQuestionNotFound = "ไม่พบข้อมูลแบบสอบถาม";
|
||||
public static readonly string RetirementQuestionnaireQuestionNotFound = "ไม่พบข้อมูลคำถาม";
|
||||
#endregion
|
||||
|
||||
#region " Command "
|
||||
|
|
@ -117,6 +118,11 @@
|
|||
public static readonly string MethodForCommandTypeNotImplement = "Method for this command type not implement!";
|
||||
|
||||
#endregion
|
||||
#region " Command "
|
||||
|
||||
public static readonly string CandidateNotFound = "ไม่พบรายการใบสมัครสอบคัดเลือก";
|
||||
|
||||
#endregion
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue