เพิ่มฟิวคำสั่ง

BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs

@@ -342,7 +342,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        //    NewPositionType = p.PositionType == null ? "" : p.PositionType.Name,
                                        //    NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(),
                                        NewSalary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
-                                       AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber(),
+                                       AppointDate = p.ReportingDate == null ? "" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        Reason = p.Reason == null ? "-" : p.Reason,
                                    })
                                   .ToList();
@@ -407,7 +407,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        //    NewPositionType = p.PositionType == null ? "" : p.PositionType.Name,
                                        //    NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(),
                                        NewSalary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
-                                       AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber(),
+                                       AppointDate = p.ReportingDate == null ? "" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                        Reason = p.Reason == null ? "-" : p.Reason,
                                    })
                                   .ToList();
@@ -722,7 +722,7 @@ namespace BMA.EHR.Application.Repositories.Commands
                                    //    NewPositionType = p.PositionType == null ? "" : p.PositionType.Name,
                                    //    NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(),
                                    NewSalary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
-                                   AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber(),
+                                   AppointDate = p.ReportingDate == null ? "" : p.ReportingDate.Value.ToThaiShortDate2().ToThaiNumber(),
                                    Reason = p.Reason == null ? "-" : p.Reason,
                                })
                               .ToList();

BMA.EHR.Domain/Models/Placement/PlacementAppointment.cs

@@ -13,8 +13,8 @@ namespace BMA.EHR.Domain.Models.Placement
     {
         [Comment("สถานะคำขอ")]
         public string Status { get; set; } = "WAITTING";
-        [Comment("วันที่บรรจุ")]
+        // [Comment("วันที่บรรจุ")]
-        public DateTime? RecruitDate { get; set; }
+        // public DateTime? RecruitDate { get; set; }
         [Comment("วันที่รายงานตัว")]
         public DateTime? ReportingDate { get; set; }
         [Comment("ประเภทราชการ")]

BMA.EHR.Domain/Models/Placement/PlacementReceive.cs

@@ -33,7 +33,7 @@ namespace BMA.EHR.Domain.Models.Placement
         [Comment("เงินเดือน")]
         public double? Amount { get; set; }
         [Comment("วันที่บรรจุ")]
-        public DateTime? RecruitDate { get; set; }
+        public DateTime? ReportingDate { get; set; }
         [Comment("เหตุผลที่รับโอนราชการ")]
         public string? Reason { get; set; }
 
@@ -157,8 +157,8 @@ namespace BMA.EHR.Domain.Models.Placement
         public string? child4ShortNameOld { get; set; }
         [Comment("เลขที่ตำแหน่ง old")]
         public int? posMasterNoOld { get; set; }
-        [Comment("ชื่อตำแหน่งในสายงาน old")]
+        // [Comment("ชื่อตำแหน่งในสายงาน old")]
-        public string? positionOld { get; set; }
+        // public string? positionOld { get; set; }
         [Comment("id ประเภทตำแหน่ง old")]
         public string? posTypeOldId { get; set; }
         [Comment("ชื่อประเภทตำแหน่ง old")]

BMA.EHR.Infrastructure/Migrations/20240507085607_update table PlacementRecive add reportdate1.cs

@@ -0,0 +1,88 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class updatetablePlacementReciveaddreportdate1 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // migrationBuilder.DropColumn(
+            //     name: "PositionOld",
+            //     table: "PlacementReceives");
+
+            migrationBuilder.DropColumn(
+                name: "RecruitDate",
+                table: "PlacementAppointments");
+
+            // migrationBuilder.RenameColumn(
+            //     name: "positionOld",
+            //     table: "PlacementReceives",
+            //     newName: "PositionOld");
+
+            migrationBuilder.RenameColumn(
+                name: "RecruitDate",
+                table: "PlacementReceives",
+                newName: "ReportingDate");
+
+            // migrationBuilder.AlterColumn<string>(
+            //     name: "PositionOld",
+            //     table: "PlacementReceives",
+            //     type: "longtext",
+            //     nullable: true,
+            //     comment: "ตำแหน่งเดิม",
+            //     oldClrType: typeof(string),
+            //     oldType: "longtext",
+            //     oldNullable: true,
+            //     oldComment: "ชื่อตำแหน่งในสายงาน old")
+            //     .Annotation("MySql:CharSet", "utf8mb4")
+            //     .OldAnnotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            // migrationBuilder.RenameColumn(
+            //     name: "PositionOld",
+            //     table: "PlacementReceives",
+            //     newName: "positionOld");
+
+            migrationBuilder.RenameColumn(
+                name: "ReportingDate",
+                table: "PlacementReceives",
+                newName: "RecruitDate");
+
+            // migrationBuilder.AlterColumn<string>(
+            //     name: "positionOld",
+            //     table: "PlacementReceives",
+            //     type: "longtext",
+            //     nullable: true,
+            //     comment: "ชื่อตำแหน่งในสายงาน old",
+            //     oldClrType: typeof(string),
+            //     oldType: "longtext",
+            //     oldNullable: true,
+            //     oldComment: "ตำแหน่งเดิม")
+            //     .Annotation("MySql:CharSet", "utf8mb4")
+            //     .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            // migrationBuilder.AddColumn<string>(
+            //     name: "PositionOld",
+            //     table: "PlacementReceives",
+            //     type: "longtext",
+            //     nullable: true,
+            //     comment: "ตำแหน่งเดิม")
+            //     .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "RecruitDate",
+                table: "PlacementAppointments",
+                type: "datetime(6)",
+                nullable: true,
+                comment: "วันที่บรรจุ");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/ApplicationDBContextModelSnapshot.cs

@@ -11167,10 +11167,6 @@ namespace BMA.EHR.Infrastructure.Migrations
                         .HasColumnType("longtext")
                         .HasComment("เหตุผลที่รับย้ายราชการ");
 
-                    b.Property<DateTime?>("RecruitDate")
-                        .HasColumnType("datetime(6)")
-                        .HasComment("วันที่บรรจุ");
-
                     b.Property<DateTime?>("ReportingDate")
                         .HasColumnType("datetime(6)")
                         .HasComment("วันที่รายงานตัว");
@@ -12707,16 +12703,16 @@ namespace BMA.EHR.Infrastructure.Migrations
                         .HasColumnType("longtext")
                         .HasComment("เหตุผลที่รับโอนราชการ");
 
-                    b.Property<DateTime?>("RecruitDate")
-                        .HasColumnType("datetime(6)")
-                        .HasComment("วันที่บรรจุ");
-
                     b.Property<Guid?>("RelationshipId")
                         .HasColumnType("char(36)");
 
                     b.Property<Guid?>("ReligionId")
                         .HasColumnType("char(36)");
 
+                    b.Property<DateTime?>("ReportingDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("วันที่บรรจุ");
+
                     b.Property<string>("Status")
                         .IsRequired()
                         .HasColumnType("longtext")
@@ -12899,10 +12895,6 @@ namespace BMA.EHR.Infrastructure.Migrations
                         .HasColumnType("longtext")
                         .HasComment("id ตำแหน่ง");
 
-                    b.Property<string>("positionOld")
-                        .HasColumnType("longtext")
-                        .HasComment("ชื่อตำแหน่งในสายงาน old");
-
                     b.Property<string>("posmasterId")
                         .HasColumnType("longtext")
                         .HasComment("id อัตรากำลัง");

BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs

@@ -131,7 +131,7 @@ namespace BMA.EHR.Placement.Service.Controllers
 
                             p.Status,
                             p.Amount,
-                            p.RecruitDate,
+                            // p.RecruitDate,
                             p.ReportingDate,
 
                             p.IsActive,
@@ -228,7 +228,7 @@ namespace BMA.EHR.Placement.Service.Controllers
 
                             p.Status,
                             p.Amount,
-                            p.RecruitDate,
+                            p.ReportingDate,
 
                             p.CreatedAt,
                             p.Reason,
@@ -244,6 +244,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                             p.PositionOld,
                             // PlacementAppointmentDocs = p.PlacementAppointmentDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
                             p.typeCommand,
+                            p.posmasterId,
                         })
                        .FirstOrDefaultAsync();
             if (data == null)
@@ -322,7 +323,7 @@ namespace BMA.EHR.Placement.Service.Controllers
 
                 data.Status,
                 data.Amount,
-                data.RecruitDate,
+                data.ReportingDate,
 
                 data.CreatedAt,
                 data.Reason,
@@ -338,6 +339,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                 data.PositionOld,
                 // Docs = placementAppointmentDocs,
                 data.typeCommand,
+                data.posmasterId,
             };
 
             return Success(_data);

BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs

@@ -131,7 +131,7 @@ namespace BMA.EHR.Placement.Service.Controllers
 
                             p.Status,
                             p.Amount,
-                            p.RecruitDate,
+                            // p.RecruitDate,
                             p.ReportingDate,
 
                             p.IsActive,
@@ -226,7 +226,7 @@ namespace BMA.EHR.Placement.Service.Controllers
 
                             p.Status,
                             p.Amount,
-                            p.RecruitDate,
+                            p.ReportingDate,
 
                             p.CreatedAt,
                             p.Reason,
@@ -320,7 +320,7 @@ namespace BMA.EHR.Placement.Service.Controllers
 
                 data.Status,
                 data.Amount,
-                data.RecruitDate,
+                data.ReportingDate,
 
                 data.CreatedAt,
                 data.Reason,
@@ -536,7 +536,7 @@ namespace BMA.EHR.Placement.Service.Controllers
             uppdated.posLevelId = req.posLevelId;
             uppdated.posLevelName = req.posLevelName;
             uppdated.Amount = req.Amount;
-            uppdated.RecruitDate = req.RecruitDate;
+            // uppdated.RecruitDate = req.RecruitDate;
             uppdated.ReportingDate = req.reportingDate;
             uppdated.Status = "PENDING";
             uppdated.LastUpdateFullName = FullName ?? "System Administrator";

BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs

@@ -100,8 +100,9 @@ namespace BMA.EHR.Placement.Service.Controllers
                                 p.firstName,
                                 p.lastName,
                                 p.citizenId,
+                                p.DateOfBirth,
                                 p.Status,
-                                p.RecruitDate,
+                                p.ReportingDate,
                                 p.root,
                                 p.rootId,
                                 p.rootShortName,
@@ -126,6 +127,11 @@ namespace BMA.EHR.Placement.Service.Controllers
                                 p.posTypeName,
                                 p.posLevelId,
                                 p.posLevelName,
+                                p.posmasterId,
+                                node = p.root == null ? (int?)null : (p.child1 == null ? 0 : (p.child2 == null ? 1 : (p.child3 == null ? 2 : (p.child4 == null ? 3 : 4)))),
+                                nodeName = p.root == null ? null : (p.child1 == null ? p.root : (p.child2 == null ? p.child1 : (p.child3 == null ? p.child2 : (p.child4 == null ? p.child3 : p.child4)))),
+                                nodeId = p.rootId == null ? null : (p.child1Id == null ? p.rootId : (p.child2Id == null ? p.child1Id : (p.child3Id == null ? p.child2Id : (p.child4Id == null ? p.child3Id : p.child4Id)))),
+                                nodeShortName = p.rootShortName == null ? null : (p.child1ShortName == null ? p.rootShortName : (p.child2ShortName == null ? p.child1ShortName : (p.child3ShortName == null ? p.child2ShortName : (p.child4ShortName == null ? p.child3ShortName : p.child4ShortName)))),
 
                                 p.IsActive,
                                 p.Reason,
@@ -153,7 +159,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                 p.child4OldId,
                                 p.child4ShortNameOld,
                                 p.posMasterNoOld,
-                                p.positionOld,
+                                p.PositionOld,
                                 p.posTypeOldId,
                                 p.posTypeNameOld,
                                 p.posLevelOldId,
@@ -200,7 +206,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                             p.TelephoneNumber,
                             p.Status,
                             p.Amount,
-                            p.RecruitDate,
+                            p.ReportingDate,
                             p.root,
                             p.rootId,
                             p.rootShortName,
@@ -294,7 +300,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                 data.TelephoneNumber,
                 data.Status,
                 data.Amount,
-                data.RecruitDate,
+                data.ReportingDate,
                 data.root,
                 data.rootId,
                 data.rootShortName,
@@ -412,10 +418,10 @@ namespace BMA.EHR.Placement.Service.Controllers
                 if (org != null && org.result != null)
                 {
                     placementReceive.profileId = org.result.profileId;
-                    placementReceive.prefix = org.result.prefix;
+                    // placementReceive.prefix = org.result.prefix;
-                    placementReceive.firstName = org.result.firstName;
+                    // placementReceive.firstName = org.result.firstName;
-                    placementReceive.lastName = org.result.lastName;
+                    // placementReceive.lastName = org.result.lastName;
-                    placementReceive.citizenId = org.result.citizenId;
+                    // placementReceive.citizenId = org.result.citizenId;
                     placementReceive.rootOld = org.result.root;
                     placementReceive.rootOldId = org.result.rootId;
                     placementReceive.rootShortNameOld = org.result.rootShortName;
@@ -448,7 +454,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                                                             (org.result.child3 == null ? "" : org.result.child3 + "/") +
                                                             (org.result.child2 == null ? "" : org.result.child2 + "/") +
                                                             (org.result.child1 == null ? "" : org.result.child1 + "/") +
-                                                            (org.result.root == null ? "" : org.result.root + "/");
+                                                            (org.result.root == null ? "" : org.result.root);
                     placementReceive.OrganizationPositionOld = org.result.position + "-" + placementReceive.OrganizationOld;
                 }
             }
@@ -598,7 +604,7 @@ namespace BMA.EHR.Placement.Service.Controllers
             uppdated.posLevelId = req.posLevelId;
             uppdated.posLevelName = req.posLevelName;
             uppdated.Amount = req.Amount;
-            uppdated.RecruitDate = req.RecruitDate;
+            uppdated.ReportingDate = req.reportingDate;
             uppdated.Status = "PENDING";
             uppdated.LastUpdateFullName = FullName ?? "System Administrator";
             uppdated.LastUpdateUserId = UserId ?? "";

BMA.EHR.Placement.Service/Requests/PersonSelectPositionReceiveRequest.cs

@@ -5,7 +5,7 @@ namespace BMA.EHR.Placement.Service.Requests
 {
     public class PersonSelectPositionReceiveRequest
     {
-        public DateTime? RecruitDate { get; set; }
+        // public DateTime? reportingDate { get; set; }
         // public Guid? PosNoId { get; set; }
         // public Guid? PositionId { get; set; }
         // public Guid? PositionLevelId { get; set; }