Merge branch 'develop' into work

BMA.EHR.Domain/Models/Commands/Core/Command.cs

@@ -1,11 +1,6 @@
 using BMA.EHR.Domain.Models.Base;
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BMA.EHR.Domain.Models.Commands.Core
 {
@@ -51,12 +46,12 @@ namespace BMA.EHR.Domain.Models.Commands.Core
         [Required, MaxLength(500), Comment("คำสั่งเรื่อง")]
         public string CommandSubject { get; set; } = string.Empty;
 
-        public virtual List<CommandDocument> Documents { get; set; } = new();
-
         #region " For Placement Command "
 
         [Required, Comment("อ้างอิงรอบการสอบ")]
-        public Guid ExamRoundId { get; set; }
+        public Guid PlacementId { get; set; }
+
+        public Placement.Placement Placement { get; set; }
 
         [Required, Comment("ตำแหน่งที่บรรจุ")]
         public string PositionName { get; set; } = string.Empty;
@@ -74,5 +69,14 @@ namespace BMA.EHR.Domain.Models.Commands.Core
         public DateTime ConclusionResultDate { get; set; } = DateTime.Now;
 
         #endregion
+
+        public virtual List<CommandDocument> Documents { get; set; } = new();
+
+        public virtual List<CommandReceiver> Receivers { get; set; }
+
+        public virtual List<CommandDeployment> Deployments { get; set; }
+
+        [Required, Comment("รหัสส่วนราชการผู้ออกคำสั่ง")]
+        public virtual Guid OwnerGovId { get; set; } = Guid.Empty;
     }
 }

BMA.EHR.Domain/Models/Commands/Core/CommandDeployment.cs

@@ -0,0 +1,47 @@
+using BMA.EHR.Domain.Models.Base;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+
+namespace BMA.EHR.Domain.Models.Commands.Core
+{
+    public class CommandDeployment : EntityBase
+    {
+        [Comment("รหัสอ้างอิงคำสั่ง")]
+        public Guid CommandId { get; set; } = Guid.Empty;
+
+        public Command Command { get; set; } = new();
+
+        [Required, Comment("รหัสอ้างอิงผู้ใช้งานระบบ")]
+        public string ReceiveUserId { get; set; } = string.Empty;
+
+        [Required, Comment("ลำดับ")]
+        public int Sequence { get; set; } = 0;
+
+        [MaxLength(13), Required, Comment("เลขประจำตัวประชาชน")]
+        public string CitizenId { get; set; } = string.Empty;
+
+        [MaxLength(50), Required, Comment("คำนำหน้านาม")]
+        public string Prefix { get; set; } = string.Empty;
+
+        [MaxLength(100), Required, Comment("ชื่อ")]
+        public string FirstName { get; set; } = string.Empty;
+
+        [MaxLength(100), Required, Comment("นามสกุล")]
+        public string LastName { get; set; } = string.Empty;
+
+        [Required, Comment("ส่งอีเมล์หรือไม่?")]
+        public bool IsSendMail { get; set; } = true;
+
+        [Required, Comment("ส่งกล่องข้อความหรือไม่?")]
+        public bool IsSendInbox { get; set; } = true;
+
+        [Required, Comment("ส่งแจ้งเตือนหรือไม่?")]
+        public bool IsSendNotification { get; set; } = true;
+
+        [Comment("ชื่อหน่วยงานของผู้รับสำเนาคำสั่ง")]
+        public string OrganizationName { get; set; } = string.Empty;
+
+        [Comment("ชื่อตำแหน่งของผู้รับสำเนาคำสั่ง")]
+        public string PositionName { get; set; } = string.Empty;
+    }
+}

BMA.EHR.Domain/Models/Commands/Core/CommandReceiver.cs

@@ -0,0 +1,36 @@
+using BMA.EHR.Domain.Models.Base;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace BMA.EHR.Domain.Models.Commands.Core
+{
+    public class CommandReceiver : EntityBase
+    {
+        [Comment("รหัสอ้างอิงคำสั่ง")]
+        public Guid CommandId { get; set; } = Guid.Empty;
+
+        public Command Command { get; set; } = new();
+
+        [Required, Comment("ลำดับในบัญชีแนบท้าย")]
+        public int Sequence { get; set; } = 0;
+
+        [MaxLength(13), Required, Comment("เลขประจำตัวประชาชน")]
+        public string CitizenId { get; set; } = string.Empty;
+
+        [MaxLength(50), Required, Comment("คำนำหน้านาม")]
+        public string Prefix { get; set; } = string.Empty;
+
+        [MaxLength(100), Required, Comment("ชื่อ")]
+        public string FirstName { get; set; } = string.Empty;
+
+        [MaxLength(100), Required, Comment("นามสกุล")]
+        public string LastName { get; set; } = string.Empty;
+
+        [Column(TypeName = "text"), Comment("หมายเหตุ")]
+        public string Comment { get; set; } = string.Empty;
+
+        [Comment("รหัสอ้างอิงไปยังข้อมูลผู้บรรจุ")]
+        public Guid? RefPlacementProfileId { get; set; }
+    }
+}

BMA.EHR.Domain/Models/Commands/Core/CommandType.cs

@@ -11,5 +11,8 @@ namespace BMA.EHR.Domain.Models.Commands.Core
 
         [Required, MaxLength(100), Comment("ประเภทคำสั่ง")]
         public string Category { get; set; } = string.Empty;
+
+        [Comment("รหัสของประเภทคำสั่ง")]
+        public string CommandCode { get; set; } = string.Empty;
     }
 }