เพิ่มฟิล ตามที่เพลงขอ และเติมที่จำเป็น

Migrations/25631211121721_AddMoreMigrationsField.Designer.cs

@@ -0,0 +1,710 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using TTSW.EF;
+
+namespace tb320eva.Migrations
+{
+    [DbContext(typeof(DataContext))]
+    [Migration("25631211121721_AddMoreMigrationsField")]
+    partial class AddMoreMigrationsField
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
+                .HasAnnotation("ProductVersion", "2.2.4-servicing-10062")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("command_no")
+                        .HasMaxLength(4000);
+
+                    b.Property<int?>("create_evaluation_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("fiscal_year");
+
+                    b.Property<DateTime?>("imported_date");
+
+                    b.Property<string>("imported_file")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit");
+
+                    b.Property<decimal?>("limit_frame");
+
+                    b.Property<decimal?>("limit_frame_quota");
+
+                    b.Property<decimal?>("limit_quota");
+
+                    b.Property<int?>("managed_by");
+
+                    b.Property<decimal?>("percentage");
+
+                    b.Property<DateTime?>("theDate");
+
+                    b.Property<int?>("theRound");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_id");
+
+                    b.ToTable("eva_adjust_postponement");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("adjust_postponement_id");
+
+                    b.Property<int?>("adjust_postponement_quota_id");
+
+                    b.Property<decimal?>("cost_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("middle");
+
+                    b.Property<string>("migration_eva_result")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("migration_total_score");
+
+                    b.Property<decimal?>("new_cost_living");
+
+                    b.Property<decimal?>("new_sarary");
+
+                    b.Property<decimal?>("new_sarary_with_quota");
+
+                    b.Property<decimal?>("other_money_at_this_time");
+
+                    b.Property<decimal?>("position_allowance_at_this_time");
+
+                    b.Property<string>("position_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("promoted_percentage");
+
+                    b.Property<decimal?>("receive_quota");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("sarary");
+
+                    b.Property<decimal?>("total_promote");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("adjust_postponement_id");
+
+                    b.HasIndex("adjust_postponement_quota_id");
+
+                    b.ToTable("eva_adjust_postponement_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("evaluation_group_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<Guid?>("performance_plan_id");
+
+                    b.Property<decimal?>("score1");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<int?>("supervisor1_id");
+
+                    b.Property<int?>("supervisor2_id");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("evaluation_group_id");
+
+                    b.HasIndex("performance_plan_id");
+
+                    b.ToTable("eva_create_evaluation");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detailEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<decimal?>("Final_summary_chief");
+
+                    b.Property<decimal?>("Final_summary_competency_chief");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor1A");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor2A");
+
+                    b.Property<decimal?>("Final_summary_supervisor");
+
+                    b.Property<decimal?>("Final_summary_supervisor1A");
+
+                    b.Property<decimal?>("Final_summary_supervisor2A");
+
+                    b.Property<decimal?>("achievement_chief");
+
+                    b.Property<decimal?>("achievement_supervisor");
+
+                    b.Property<decimal?>("achievement_supervisor1A");
+
+                    b.Property<decimal?>("achievement_supervisor2A");
+
+                    b.Property<int?>("chief");
+
+                    b.Property<decimal?>("competency_chief");
+
+                    b.Property<decimal?>("competency_supervisor");
+
+                    b.Property<decimal?>("competency_supervisor1A");
+
+                    b.Property<decimal?>("competency_supervisor2A");
+
+                    b.Property<int?>("create_evaluation_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_score_chief")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor1A")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor2A")
+                        .HasMaxLength(255);
+
+                    b.Property<decimal?>("score_chief");
+
+                    b.Property<decimal?>("score_supervisor");
+
+                    b.Property<decimal?>("score_supervisor1A");
+
+                    b.Property<decimal?>("score_supervisor2A");
+
+                    b.Property<string>("status_chief")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_chief_click_date");
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_self_click_date");
+
+                    b.Property<string>("status_supervisor")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_supervisor1A")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor1A_click_date");
+
+                    b.Property<string>("status_supervisor2A")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor2A_click_date");
+
+                    b.Property<DateTime?>("status_supervisor_click_date");
+
+                    b.Property<int?>("supervisor1");
+
+                    b.Property<int?>("supervisor1A");
+
+                    b.Property<DateTime?>("supervisor1A_date");
+
+                    b.Property<string>("supervisor1A_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1A_result")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("supervisor1_date");
+
+                    b.Property<string>("supervisor1_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1_result")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor2");
+
+                    b.Property<int?>("supervisor2A");
+
+                    b.Property<DateTime?>("supervisor2A_date");
+
+                    b.Property<string>("supervisor2A_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor2A_result")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("supervisor2_date");
+
+                    b.Property<string>("supervisor2_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor2_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("total_summary_chief");
+
+                    b.Property<decimal?>("total_summary_competency_chief");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor1A");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor2A");
+
+                    b.Property<decimal?>("total_summary_supervisor");
+
+                    b.Property<decimal?>("total_summary_supervisor1A");
+
+                    b.Property<decimal?>("total_summary_supervisor2A");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_create_evaluation_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("achievement")
+                        .HasMaxLength(1000);
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("score");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<decimal?>("score3");
+
+                    b.Property<decimal?>("score4");
+
+                    b.Property<decimal?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    b.Property<decimal?>("sumary3");
+
+                    b.Property<decimal?>("sumary4");
+
+                    b.Property<string>("target_score1")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score2")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score3")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score4")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score5")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("thefile")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("weight");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_achievement");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("behavior")
+                        .HasMaxLength(1000);
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("score");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<decimal?>("score3");
+
+                    b.Property<decimal?>("score4");
+
+                    b.Property<decimal?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    b.Property<decimal?>("sumary3");
+
+                    b.Property<decimal?>("sumary4");
+
+                    b.Property<string>("target_score1")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score2")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score3")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score4")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score5")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("weight");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_behavior");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_groupEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("thegroup")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_evaluation_group");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("evaluation_group_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("evaluation_group_id");
+
+                    b.ToTable("eva_evaluation_group_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_idp_planEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("develop")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("development_method")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("end_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("period_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("start_date");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_idp_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_level_scoreEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("detail")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("max_score");
+
+                    b.Property<decimal?>("min_score");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_level_score");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("fiscal_year");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<int?>("theTime");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_performance_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<DateTime?>("end_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<int?>("list_no");
+
+                    b.Property<Guid?>("performance_plan_id");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("start_date");
+
+                    b.Property<string>("step")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("performance_plan_id");
+
+                    b.ToTable("eva_performance_plan_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("detail")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<Guid?>("level_score_id");
+
+                    b.Property<decimal?>("max_score");
+
+                    b.Property<decimal?>("min_score");
+
+                    b.Property<decimal?>("promoted_percentage");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("level_score_id");
+
+                    b.ToTable("eva_promoted_percentage");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_salary_cylinderEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<decimal?>("cost_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("middle");
+
+                    b.Property<int?>("position_level");
+
+                    b.Property<int?>("position_type");
+
+                    b.Property<decimal?>("temporary_min");
+
+                    b.Property<decimal?>("themax");
+
+                    b.Property<decimal?>("themin");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_salary_cylinder");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement")
+                        .WithMany()
+                        .HasForeignKey("adjust_postponement_id");
+
+                    b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement_quota")
+                        .WithMany()
+                        .HasForeignKey("adjust_postponement_quota_id")
+                        .HasConstraintName("FK_eva_adjust_postponement_detail_eva_adjust_postponement_adj~1");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group")
+                        .WithMany()
+                        .HasForeignKey("evaluation_group_id");
+
+                    b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan")
+                        .WithMany()
+                        .HasForeignKey("performance_plan_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group")
+                        .WithMany()
+                        .HasForeignKey("evaluation_group_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan")
+                        .WithMany()
+                        .HasForeignKey("performance_plan_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_level_scoreEntity", "eva_level_score")
+                        .WithMany()
+                        .HasForeignKey("level_score_id");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Migrations/25631211121721_AddMoreMigrationsField.cs

@@ -0,0 +1,50 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace tb320eva.Migrations
+{
+    public partial class AddMoreMigrationsField : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "migration_eva_result",
+                table: "eva_adjust_postponement_detail",
+                maxLength: 1000,
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "migration_total_score",
+                table: "eva_adjust_postponement_detail",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "other_money_at_this_time",
+                table: "eva_adjust_postponement_detail",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "position_allowance_at_this_time",
+                table: "eva_adjust_postponement_detail",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "migration_eva_result",
+                table: "eva_adjust_postponement_detail");
+
+            migrationBuilder.DropColumn(
+                name: "migration_total_score",
+                table: "eva_adjust_postponement_detail");
+
+            migrationBuilder.DropColumn(
+                name: "other_money_at_this_time",
+                table: "eva_adjust_postponement_detail");
+
+            migrationBuilder.DropColumn(
+                name: "position_allowance_at_this_time",
+                table: "eva_adjust_postponement_detail");
+        }
+    }
+}

Migrations/DataContextModelSnapshot.cs

@@ -85,12 +85,21 @@ namespace tb320eva.Migrations
 
                     b.Property<decimal?>("middle");
 
+                    b.Property<string>("migration_eva_result")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("migration_total_score");
+
                     b.Property<decimal?>("new_cost_living");
 
                     b.Property<decimal?>("new_sarary");
 
                     b.Property<decimal?>("new_sarary_with_quota");
 
+                    b.Property<decimal?>("other_money_at_this_time");
+
+                    b.Property<decimal?>("position_allowance_at_this_time");
+
                     b.Property<string>("position_this_time")
                         .HasMaxLength(1000);
 

Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs

@@ -52,5 +52,14 @@ namespace TodoAPI2.Models
 
         [MaxLength(1000)]
         public string level_this_time { get; set; }
+
+        public decimal? position_allowance_at_this_time { get; set; }
+
+        public decimal? other_money_at_this_time { get; set; }
+
+        public decimal? migration_total_score { get; set; }
+
+        [MaxLength(1000)]
+        public string migration_eva_result { get; set; }
     }
 }

Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationInputModel.cs

@@ -46,7 +46,16 @@ namespace TodoAPI2.Models
 
         public string level_this_time { get; set; }
 
+        public decimal? position_allowance_at_this_time { get; set; }
+
+        public decimal? other_money_at_this_time { get; set; }
+
+        public decimal? migration_total_score { get; set; }
+
+        public string migration_eva_result { get; set; }
+
         public string active_mode { get; set; }
+
     }
 }
 

Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs

@@ -146,6 +146,11 @@ namespace TodoAPI2.Models
                     position_this_time = m_eva_adjust_postponement_detail_migration.position_this_time,
                     level_this_time = m_eva_adjust_postponement_detail_migration.level_this_time,
 
+                    position_allowance_at_this_time = m_eva_adjust_postponement_detail_migration.position_allowance_at_this_time,
+                    other_money_at_this_time = m_eva_adjust_postponement_detail_migration.other_money_at_this_time,
+                    migration_total_score = m_eva_adjust_postponement_detail_migration.migration_total_score,
+                    migration_eva_result = m_eva_adjust_postponement_detail_migration.migration_eva_result,
+
                     adjust_postponement_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult1.fiscal_year,
                     adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult2.fiscal_year,
                     employee_id_external_linkage_external_name = fk_external_linkageResult3.fullname,
@@ -212,6 +217,11 @@ namespace TodoAPI2.Models
                 existingEntity.position_this_time = model.position_this_time;
                 existingEntity.level_this_time = model.level_this_time;
 
+                existingEntity.position_allowance_at_this_time = model.position_allowance_at_this_time;
+                existingEntity.other_money_at_this_time = model.other_money_at_this_time;
+                existingEntity.migration_total_score = model.migration_total_score;
+                existingEntity.migration_eva_result = model.migration_eva_result;
+
                 var updated = _repository.Update(id, existingEntity);
                 return Get(updated.id);
             }
@@ -244,6 +254,11 @@ namespace TodoAPI2.Models
                         existingEntity.position_this_time = i.position_this_time;
                         existingEntity.level_this_time = i.level_this_time;
 
+                        existingEntity.position_allowance_at_this_time = i.position_allowance_at_this_time;
+                        existingEntity.other_money_at_this_time = i.other_money_at_this_time;
+                        existingEntity.migration_total_score = i.migration_total_score;
+                        existingEntity.migration_eva_result = i.migration_eva_result;
+
                         //existingEntity.SetAutoField(_repository.Context);
                         _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
                     }

Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationViewModel.cs

@@ -44,6 +44,14 @@ namespace TodoAPI2.Models
 
         public string level_this_time { get; set; }
 
+        public decimal? position_allowance_at_this_time { get; set; }
+
+        public decimal? other_money_at_this_time { get; set; }
+
+        public decimal? migration_total_score { get; set; }
+
+        public string migration_eva_result { get; set; }
+
         public int? adjust_postponement_id_eva_adjust_postponement_fiscal_year { get; set; }
         public int? adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year { get; set; }
         public string employee_id_external_linkage_external_name { get; set; }

Views/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration_d.cshtml

@@ -153,7 +153,10 @@
                 <th><label id='h_eva_adjust_postponement_detail_migration_receive_quota'>ได้รับเงินโควต้าพิเศษ</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_migration_new_sarary_with_quota'>เงินเดือนใหม่ (รวมโควต้า)</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_migration_remark'>หมายเหตุ</label></th>
-
+                <th><label id='h_eva_adjust_postponement_detail_migration_position_allowance_at_this_time'>เงินประจำแหน่ง (ณ วันปรับเลื่อน)</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_other_money_at_this_time'>ค่าตอบแทนรายเดือน (ณ วันปรับเลื่อน)</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_migration_total_score'>คะแนนรวม (ณ วันปรับเลื่อน)</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_migration_eva_result'>ผลการประเมิน (ณ วันปรับเลื่อน)</label></th>
             </tr>
         </thead>
         <tbody></tbody>
@@ -249,9 +252,33 @@
 
                         <div class="form-group col-md-4">
                             <label id="lab_eva_adjust_postponement_detail_migration_remark" for="eva_adjust_postponement_detail_migration_remark">หมายเหตุ</label>
-                            <input class="form-control" id="eva_adjust_postponement_detail_migration_remark" iLabel="หมายเหตุ" iRequire="false" iGroup="eva_adjust_postponement_detail_migration"></textarea>
+                            <input class="form-control" id="eva_adjust_postponement_detail_migration_remark" iLabel="หมายเหตุ" iRequire="false" iGroup="eva_adjust_postponement_detail_migration">
                         </div>
                     </div>
+
+                    <div class='row'>
+                        <div class="form-group col-md-4">
+                            <label id="lab_eva_adjust_postponement_detail_migration_position_allowance_at_this_time" for="eva_adjust_postponement_detail_migration_position_allowance_at_this_time">เงินประจำแหน่ง (ณ วันปรับเลื่อน)</label>
+                            <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_position_allowance_at_this_time" iLabel="เงินประจำแหน่ง (ณ วันปรับเลื่อน)" iRequire="false" iGroup="eva_adjust_postponement_detail_migration" />
+                        </div>
+
+                        <div class="form-group col-md-4">
+                            <label id="lab_eva_adjust_postponement_detail_migration_other_money_at_this_time" for="eva_adjust_postponement_detail_migration_other_money_at_this_time">ค่าตอบแทนรายเดือน (ณ วันปรับเลื่อน)</label>
+                            <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_other_money_at_this_time" iLabel="ค่าตอบแทนรายเดือน (ณ วันปรับเลื่อน)" iRequire="false" iGroup="eva_adjust_postponement_detail_migration" />
+                        </div>
+                    </div>
+                    <div class='row'>
+                        <div class="form-group col-md-4">
+                            <label id="lab_eva_adjust_postponement_detail_migration_migration_total_score" for="eva_adjust_postponement_detail_migration_migration_total_score">คะแนนรวม (ณ วันปรับเลื่อน)</label>
+                            <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_migration_total_score" iLabel="คะแนนรวม (ณ วันปรับเลื่อน)" iRequire="false" iGroup="eva_adjust_postponement_detail_migration" />
+                        </div>
+
+                        <div class="form-group col-md-4">
+                            <label id="lab_eva_adjust_postponement_detail_migration_migration_eva_result" for="eva_adjust_postponement_detail_migration_migration_eva_result">ผลการประเมิน (ณ วันปรับเลื่อน)</label>
+                            <input class="form-control" type="text" id="eva_adjust_postponement_detail_migration_migration_eva_result" iLabel="ผลการประเมิน (ณ วันปรับเลื่อน)" iRequire="false" iGroup="eva_adjust_postponement_detail_migration" />
+                        </div>
+                    </div>
+
                     <div class='row'>
 
                     </div>

wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js

@@ -36,6 +36,10 @@ function eva_adjust_postponement_detail_migration_FeedDataToForm(data) {
     $("#eva_adjust_postponement_detail_migration_new_sarary_with_quota").val(data.new_sarary_with_quota);
     $("#eva_adjust_postponement_detail_migration_position_this_time").val(data.position_this_time);
     $("#eva_adjust_postponement_detail_migration_level_this_time").val(data.level_this_time);
+    $("#eva_adjust_postponement_detail_migration_position_allowance_at_this_time").val(data.position_allowance_at_this_time);
+    $("#eva_adjust_postponement_detail_migration_other_money_at_this_time").val(data.other_money_at_this_time);
+    $("#eva_adjust_postponement_detail_migration_migration_total_score").val(data.migration_total_score);
+    $("#eva_adjust_postponement_detail_migration_migration_eva_result").val(data.migration_eva_result);
 
 }
 
@@ -57,7 +61,10 @@ function eva_adjust_postponement_detail_migration_GetFromForm() {
     eva_adjust_postponement_detail_migrationObject.new_sarary_with_quota = $("#eva_adjust_postponement_detail_migration_new_sarary_with_quota").val();
     eva_adjust_postponement_detail_migrationObject.position_this_time = $("#eva_adjust_postponement_detail_migration_position_this_time").val();
     eva_adjust_postponement_detail_migrationObject.level_this_time = $("#eva_adjust_postponement_detail_migration_level_this_time").val();
-
+    eva_adjust_postponement_detail_migrationObject.position_allowance_at_this_time = $("#eva_adjust_postponement_detail_migration_position_allowance_at_this_time").val();
+    eva_adjust_postponement_detail_migrationObject.other_money_at_this_time = $("#eva_adjust_postponement_detail_migration_other_money_at_this_time").val();
+    eva_adjust_postponement_detail_migrationObject.migration_total_score = $("#eva_adjust_postponement_detail_migration_migration_total_score").val();
+    eva_adjust_postponement_detail_migrationObject.migration_eva_result = $("#eva_adjust_postponement_detail_migration_migration_eva_result").val();
 
     return eva_adjust_postponement_detail_migrationObject;
 }
@@ -197,6 +204,11 @@ var eva_adjust_postponement_detail_migration_setupTable = function (result) {
             { "data": "receive_quota" },
             { "data": "new_sarary_with_quota" },
             { "data": "remark" },
+            { "data": "position_allowance_at_this_time" },
+            { "data": "other_money_at_this_time" },
+            { "data": "migration_total_score" },
+            { "data": "migration_eva_result" },      
+
         ],
         "columnDefs": [
             {