diff --git a/EXCEL/eva_create_evaluation.xlsx b/EXCEL/eva_create_evaluation.xlsx
index 743267e..5330588 100644
Binary files a/EXCEL/eva_create_evaluation.xlsx and b/EXCEL/eva_create_evaluation.xlsx differ
diff --git a/EXCEL/eva_create_evaluation_detail.xlsx b/EXCEL/eva_create_evaluation_detail.xlsx
index b38cbf0..e604d1e 100644
Binary files a/EXCEL/eva_create_evaluation_detail.xlsx and b/EXCEL/eva_create_evaluation_detail.xlsx differ
diff --git a/Migrations/20211108074744_AddSupervisor3.Designer.cs b/Migrations/20211108074744_AddSupervisor3.Designer.cs
new file mode 100644
index 0000000..d377680
--- /dev/null
+++ b/Migrations/20211108074744_AddSupervisor3.Designer.cs
@@ -0,0 +1,1201 @@
+// <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("20211108074744_AddSupervisor3")]
+    partial class AddSupervisor3
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
+                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            modelBuilder.Entity("TodoAPI2.Models.activity_log_evaEntity", b =>
+                {
+                    b.Property<int>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int?>("causer_id");
+
+                    b.Property<string>("causer_type")
+                        .HasMaxLength(191);
+
+                    b.Property<DateTime?>("created_at");
+
+                    b.Property<string>("description")
+                        .HasMaxLength(32000);
+
+                    b.Property<string>("ip_address")
+                        .HasMaxLength(191);
+
+                    b.Property<string>("log_name")
+                        .HasMaxLength(191);
+
+                    b.Property<string>("mac_address")
+                        .HasMaxLength(191);
+
+                    b.Property<string>("properties")
+                        .HasMaxLength(32000);
+
+                    b.Property<int?>("subject_id");
+
+                    b.Property<string>("subject_type")
+                        .HasMaxLength(191);
+
+                    b.Property<DateTime?>("updated_at");
+
+                    b.HasKey("id");
+
+                    b.ToTable("activity_log_eva");
+                });
+
+            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<string>("report_type")
+                        .HasMaxLength(1000);
+
+                    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<decimal?>("achievement_final");
+
+                    b.Property<int?>("adjust_postponement_id");
+
+                    b.Property<int?>("adjust_postponement_quota_id");
+
+                    b.Property<decimal?>("competency_final");
+
+                    b.Property<decimal?>("cost_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<string>("employee_no_at_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("fullname_at_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<bool?>("is_for_postponement");
+
+                    b.Property<string>("level_score_final")
+                        .HasMaxLength(255);
+
+                    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<int?>("order_at_this_time");
+
+                    b.Property<int?>("org_at_this_time");
+
+                    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?>("reward_new");
+
+                    b.Property<decimal?>("reward_new2");
+
+                    b.Property<decimal?>("reward_old");
+
+                    b.Property<decimal?>("sarary");
+
+                    b.Property<decimal?>("score_final");
+
+                    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<int?>("supervisor3_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<int?>("chief_a");
+
+                    b.Property<DateTime?>("chief_a_date");
+
+                    b.Property<string>("chief_a_reject_reason")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("chief_a_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("chief_a_result")
+                        .HasMaxLength(1);
+
+                    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<int?>("eva_employee_id");
+
+                    b.Property<int?>("help_org_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<int?>("order_of_data");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(1000);
+
+                    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<string>("status_chief_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_chief_a_click_date");
+
+                    b.Property<DateTime?>("status_chief_click_date");
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_self_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_self_a_click_date");
+
+                    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<string>("status_supervisor_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor_a_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<int?>("supervisor1_id");
+
+                    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<int?>("supervisor2_id");
+
+                    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.Property<decimal?>("work_period");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_id");
+
+                    b.ToTable("eva_create_evaluation_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detail_historyEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("action_detail")
+                        .HasMaxLength(4000);
+
+                    b.Property<DateTime?>("action_dt");
+
+                    b.Property<int?>("action_emp_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("evaluation_detail_id");
+
+                    b.Property<int?>("history_group");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("evaluation_detail_id");
+
+                    b.ToTable("eva_create_evaluation_detail_history");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("achievement")
+                        .HasMaxLength(16000);
+
+                    b.Property<string>("achievement_line1")
+                        .HasMaxLength(16000);
+
+                    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_achievement_attachEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("achievement_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("the_file")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("achievement_id");
+
+                    b.ToTable("eva_evaluation_achievement_attach");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_detailEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<string>("achievement_detail")
+                        .HasMaxLength(16000);
+
+                    b.Property<int?>("achievement_id");
+
+                    b.Property<int?>("achievement_order");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("achievement_id");
+
+                    b.ToTable("eva_evaluation_achievement_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("behavior")
+                        .HasMaxLength(16000);
+
+                    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<int?>("main_dept_id");
+
+                    b.Property<decimal?>("percentage");
+
+                    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_evaluation_operating_agreementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("indicators")
+                        .HasMaxLength(4000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("mission_detail")
+                        .HasMaxLength(4000);
+
+                    b.Property<int?>("mission_no");
+
+                    b.Property<string>("target")
+                        .HasMaxLength(4000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_operating_agreement");
+                });
+
+            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_level_score_detailEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<Guid?>("group_guid");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<Guid?>("level_score_id");
+
+                    b.Property<decimal?>("max_percentage");
+
+                    b.Property<decimal?>("max_value");
+
+                    b.Property<decimal?>("min_percentage");
+
+                    b.Property<decimal?>("min_value");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("group_guid");
+
+                    b.HasIndex("level_score_id");
+
+                    b.ToTable("eva_level_score_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<decimal?>("cost_of_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("frame_group_guid");
+
+                    b.Property<int?>("help_org_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("monthly_remuneration");
+
+                    b.Property<int?>("order_of_data");
+
+                    b.Property<int?>("org_id");
+
+                    b.Property<decimal?>("position_allowance");
+
+                    b.Property<string>("position_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("salary");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("frame_group_guid");
+
+                    b.ToTable("eva_limit_frame_employee");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<Guid?>("frame_plan_guid");
+
+                    b.Property<Guid?>("group_guid");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit_frame_295");
+
+                    b.Property<int?>("main_dept_id");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(4000);
+
+                    b.Property<string>("remark2")
+                        .HasMaxLength(4000);
+
+                    b.Property<decimal?>("total_salary");
+
+                    b.Property<decimal?>("total_salary_limit");
+
+                    b.Property<decimal?>("total_salary_limit_rounded");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("frame_plan_guid");
+
+                    b.HasIndex("group_guid");
+
+                    b.ToTable("eva_limit_frame_group");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<DateTime?>("executed_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit_frame_005");
+
+                    b.Property<decimal?>("limit_frame_005_total");
+
+                    b.Property<decimal?>("limit_frame_005_total_rounded");
+
+                    b.Property<Guid?>("plan_guid");
+
+                    b.Property<DateTime?>("salary_adjustment_date");
+
+                    b.Property<string>("status_chief")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor1");
+
+                    b.Property<DateTime?>("supervisor1_date");
+
+                    b.Property<string>("supervisor1_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("total_salary");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("plan_guid");
+
+                    b.ToTable("eva_limit_frame_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<DateTime?>("end_leave");
+
+                    b.Property<int?>("fiscal_year");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("percent");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(500);
+
+                    b.Property<DateTime?>("start_leave");
+
+                    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<decimal?>("monthly_compensation");
+
+                    b.Property<decimal?>("position_allowance");
+
+                    b.Property<int?>("position_level");
+
+                    b.Property<int?>("position_type");
+
+                    b.Property<decimal?>("salary_max");
+
+                    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_setup_permissionEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(4000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_setup_permission");
+                });
+
+            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_create_evaluation_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation_create_evaluation_id")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detail_historyEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_evaluation_detail_id")
+                        .WithMany()
+                        .HasForeignKey("evaluation_detail_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_achievement_attachEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_achievementEntity", "eva_evaluation_achievement_achievement_id")
+                        .WithMany()
+                        .HasForeignKey("achievement_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_achievementEntity", "eva_evaluation_achievement")
+                        .WithMany()
+                        .HasForeignKey("achievement_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_evaluation_operating_agreementEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_create_evaluation_detail_id")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_level_score_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group_group_guid")
+                        .WithMany()
+                        .HasForeignKey("group_guid");
+
+                    b.HasOne("TodoAPI2.Models.eva_level_scoreEntity", "eva_level_score_level_score_id")
+                        .WithMany()
+                        .HasForeignKey("level_score_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_limit_frame_groupEntity", "eva_limit_frame_group_frame_group_guid")
+                        .WithMany()
+                        .HasForeignKey("frame_group_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_limit_frame_planEntity", "eva_limit_frame_plan_frame_plan_guid")
+                        .WithMany()
+                        .HasForeignKey("frame_plan_guid");
+
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group_group_guid")
+                        .WithMany()
+                        .HasForeignKey("group_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan_plan_guid")
+                        .WithMany()
+                        .HasForeignKey("plan_guid");
+                });
+
+            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
+        }
+    }
+}
diff --git a/Migrations/20211108074744_AddSupervisor3.cs b/Migrations/20211108074744_AddSupervisor3.cs
new file mode 100644
index 0000000..318f1f6
--- /dev/null
+++ b/Migrations/20211108074744_AddSupervisor3.cs
@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace tb320eva.Migrations
+{
+    public partial class AddSupervisor3 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "supervisor3_id",
+                table: "eva_create_evaluation",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "supervisor3_id",
+                table: "eva_create_evaluation");
+        }
+    }
+}
diff --git a/Migrations/20211108081106_AddX111.Designer.cs b/Migrations/20211108081106_AddX111.Designer.cs
new file mode 100644
index 0000000..8b19353
--- /dev/null
+++ b/Migrations/20211108081106_AddX111.Designer.cs
@@ -0,0 +1,1218 @@
+// <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("20211108081106_AddX111")]
+    partial class AddX111
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
+                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            modelBuilder.Entity("TodoAPI2.Models.activity_log_evaEntity", b =>
+                {
+                    b.Property<int>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int?>("causer_id");
+
+                    b.Property<string>("causer_type")
+                        .HasMaxLength(191);
+
+                    b.Property<DateTime?>("created_at");
+
+                    b.Property<string>("description")
+                        .HasMaxLength(32000);
+
+                    b.Property<string>("ip_address")
+                        .HasMaxLength(191);
+
+                    b.Property<string>("log_name")
+                        .HasMaxLength(191);
+
+                    b.Property<string>("mac_address")
+                        .HasMaxLength(191);
+
+                    b.Property<string>("properties")
+                        .HasMaxLength(32000);
+
+                    b.Property<int?>("subject_id");
+
+                    b.Property<string>("subject_type")
+                        .HasMaxLength(191);
+
+                    b.Property<DateTime?>("updated_at");
+
+                    b.HasKey("id");
+
+                    b.ToTable("activity_log_eva");
+                });
+
+            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<string>("report_type")
+                        .HasMaxLength(1000);
+
+                    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<decimal?>("achievement_final");
+
+                    b.Property<int?>("adjust_postponement_id");
+
+                    b.Property<int?>("adjust_postponement_quota_id");
+
+                    b.Property<decimal?>("competency_final");
+
+                    b.Property<decimal?>("cost_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<string>("employee_no_at_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("fullname_at_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<bool?>("is_for_postponement");
+
+                    b.Property<string>("level_score_final")
+                        .HasMaxLength(255);
+
+                    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<int?>("order_at_this_time");
+
+                    b.Property<int?>("org_at_this_time");
+
+                    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?>("reward_new");
+
+                    b.Property<decimal?>("reward_new2");
+
+                    b.Property<decimal?>("reward_old");
+
+                    b.Property<decimal?>("sarary");
+
+                    b.Property<decimal?>("score_final");
+
+                    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<int?>("supervisor3_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<int?>("chief_a");
+
+                    b.Property<DateTime?>("chief_a_date");
+
+                    b.Property<string>("chief_a_reject_reason")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("chief_a_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("chief_a_result")
+                        .HasMaxLength(1);
+
+                    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<int?>("eva_employee_id");
+
+                    b.Property<int?>("help_org_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<int?>("order_of_data");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(1000);
+
+                    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<string>("status_chief_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_chief_a_click_date");
+
+                    b.Property<DateTime?>("status_chief_click_date");
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_self_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_self_a_click_date");
+
+                    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<string>("status_supervisor3A")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor3A_click_date");
+
+                    b.Property<string>("status_supervisor_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor_a_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<int?>("supervisor1_id");
+
+                    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<int?>("supervisor2_id");
+
+                    b.Property<string>("supervisor2_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor2_result")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor3A");
+
+                    b.Property<DateTime?>("supervisor3A_date");
+
+                    b.Property<string>("supervisor3A_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor3A_result")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor3_id");
+
+                    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.Property<decimal?>("work_period");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_id");
+
+                    b.ToTable("eva_create_evaluation_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detail_historyEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("action_detail")
+                        .HasMaxLength(4000);
+
+                    b.Property<DateTime?>("action_dt");
+
+                    b.Property<int?>("action_emp_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("evaluation_detail_id");
+
+                    b.Property<int?>("history_group");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("evaluation_detail_id");
+
+                    b.ToTable("eva_create_evaluation_detail_history");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("achievement")
+                        .HasMaxLength(16000);
+
+                    b.Property<string>("achievement_line1")
+                        .HasMaxLength(16000);
+
+                    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_achievement_attachEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("achievement_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("the_file")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("achievement_id");
+
+                    b.ToTable("eva_evaluation_achievement_attach");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_detailEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<string>("achievement_detail")
+                        .HasMaxLength(16000);
+
+                    b.Property<int?>("achievement_id");
+
+                    b.Property<int?>("achievement_order");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("achievement_id");
+
+                    b.ToTable("eva_evaluation_achievement_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("behavior")
+                        .HasMaxLength(16000);
+
+                    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<int?>("main_dept_id");
+
+                    b.Property<decimal?>("percentage");
+
+                    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_evaluation_operating_agreementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("indicators")
+                        .HasMaxLength(4000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("mission_detail")
+                        .HasMaxLength(4000);
+
+                    b.Property<int?>("mission_no");
+
+                    b.Property<string>("target")
+                        .HasMaxLength(4000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_operating_agreement");
+                });
+
+            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_level_score_detailEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<Guid?>("group_guid");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<Guid?>("level_score_id");
+
+                    b.Property<decimal?>("max_percentage");
+
+                    b.Property<decimal?>("max_value");
+
+                    b.Property<decimal?>("min_percentage");
+
+                    b.Property<decimal?>("min_value");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("group_guid");
+
+                    b.HasIndex("level_score_id");
+
+                    b.ToTable("eva_level_score_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<decimal?>("cost_of_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("frame_group_guid");
+
+                    b.Property<int?>("help_org_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("monthly_remuneration");
+
+                    b.Property<int?>("order_of_data");
+
+                    b.Property<int?>("org_id");
+
+                    b.Property<decimal?>("position_allowance");
+
+                    b.Property<string>("position_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("salary");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("frame_group_guid");
+
+                    b.ToTable("eva_limit_frame_employee");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<Guid?>("frame_plan_guid");
+
+                    b.Property<Guid?>("group_guid");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit_frame_295");
+
+                    b.Property<int?>("main_dept_id");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(4000);
+
+                    b.Property<string>("remark2")
+                        .HasMaxLength(4000);
+
+                    b.Property<decimal?>("total_salary");
+
+                    b.Property<decimal?>("total_salary_limit");
+
+                    b.Property<decimal?>("total_salary_limit_rounded");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("frame_plan_guid");
+
+                    b.HasIndex("group_guid");
+
+                    b.ToTable("eva_limit_frame_group");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<DateTime?>("executed_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit_frame_005");
+
+                    b.Property<decimal?>("limit_frame_005_total");
+
+                    b.Property<decimal?>("limit_frame_005_total_rounded");
+
+                    b.Property<Guid?>("plan_guid");
+
+                    b.Property<DateTime?>("salary_adjustment_date");
+
+                    b.Property<string>("status_chief")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor1");
+
+                    b.Property<DateTime?>("supervisor1_date");
+
+                    b.Property<string>("supervisor1_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("total_salary");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("plan_guid");
+
+                    b.ToTable("eva_limit_frame_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<DateTime?>("end_leave");
+
+                    b.Property<int?>("fiscal_year");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("percent");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(500);
+
+                    b.Property<DateTime?>("start_leave");
+
+                    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<decimal?>("monthly_compensation");
+
+                    b.Property<decimal?>("position_allowance");
+
+                    b.Property<int?>("position_level");
+
+                    b.Property<int?>("position_type");
+
+                    b.Property<decimal?>("salary_max");
+
+                    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_setup_permissionEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(4000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_setup_permission");
+                });
+
+            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_create_evaluation_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation_create_evaluation_id")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detail_historyEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_evaluation_detail_id")
+                        .WithMany()
+                        .HasForeignKey("evaluation_detail_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_achievement_attachEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_achievementEntity", "eva_evaluation_achievement_achievement_id")
+                        .WithMany()
+                        .HasForeignKey("achievement_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_achievementEntity", "eva_evaluation_achievement")
+                        .WithMany()
+                        .HasForeignKey("achievement_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_evaluation_operating_agreementEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_create_evaluation_detail_id")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_level_score_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group_group_guid")
+                        .WithMany()
+                        .HasForeignKey("group_guid");
+
+                    b.HasOne("TodoAPI2.Models.eva_level_scoreEntity", "eva_level_score_level_score_id")
+                        .WithMany()
+                        .HasForeignKey("level_score_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_limit_frame_groupEntity", "eva_limit_frame_group_frame_group_guid")
+                        .WithMany()
+                        .HasForeignKey("frame_group_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_limit_frame_planEntity", "eva_limit_frame_plan_frame_plan_guid")
+                        .WithMany()
+                        .HasForeignKey("frame_plan_guid");
+
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group_group_guid")
+                        .WithMany()
+                        .HasForeignKey("group_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan_plan_guid")
+                        .WithMany()
+                        .HasForeignKey("plan_guid");
+                });
+
+            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
+        }
+    }
+}
diff --git a/Migrations/20211108081106_AddX111.cs b/Migrations/20211108081106_AddX111.cs
new file mode 100644
index 0000000..2ef4ba8
--- /dev/null
+++ b/Migrations/20211108081106_AddX111.cs
@@ -0,0 +1,80 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace tb320eva.Migrations
+{
+    public partial class AddX111 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "status_supervisor3A",
+                table: "eva_create_evaluation_detail",
+                maxLength: 1,
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "status_supervisor3A_click_date",
+                table: "eva_create_evaluation_detail",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "supervisor3A",
+                table: "eva_create_evaluation_detail",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "supervisor3A_date",
+                table: "eva_create_evaluation_detail",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "supervisor3A_remark",
+                table: "eva_create_evaluation_detail",
+                maxLength: 1000,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "supervisor3A_result",
+                table: "eva_create_evaluation_detail",
+                maxLength: 1,
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "supervisor3_id",
+                table: "eva_create_evaluation_detail",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "status_supervisor3A",
+                table: "eva_create_evaluation_detail");
+
+            migrationBuilder.DropColumn(
+                name: "status_supervisor3A_click_date",
+                table: "eva_create_evaluation_detail");
+
+            migrationBuilder.DropColumn(
+                name: "supervisor3A",
+                table: "eva_create_evaluation_detail");
+
+            migrationBuilder.DropColumn(
+                name: "supervisor3A_date",
+                table: "eva_create_evaluation_detail");
+
+            migrationBuilder.DropColumn(
+                name: "supervisor3A_remark",
+                table: "eva_create_evaluation_detail");
+
+            migrationBuilder.DropColumn(
+                name: "supervisor3A_result",
+                table: "eva_create_evaluation_detail");
+
+            migrationBuilder.DropColumn(
+                name: "supervisor3_id",
+                table: "eva_create_evaluation_detail");
+        }
+    }
+}
diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs
index 2504b01..5688565 100644
--- a/Migrations/DataContextModelSnapshot.cs
+++ b/Migrations/DataContextModelSnapshot.cs
@@ -216,6 +216,8 @@ namespace tb320eva.Migrations
 
                     b.Property<int?>("supervisor2_id");
 
+                    b.Property<int?>("supervisor3_id");
+
                     b.Property<DateTime>("updated");
 
                     b.HasKey("id");
@@ -348,6 +350,11 @@ namespace tb320eva.Migrations
 
                     b.Property<DateTime?>("status_supervisor2A_click_date");
 
+                    b.Property<string>("status_supervisor3A")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor3A_click_date");
+
                     b.Property<string>("status_supervisor_a")
                         .HasMaxLength(1);
 
@@ -399,6 +406,18 @@ namespace tb320eva.Migrations
                     b.Property<string>("supervisor2_result")
                         .HasMaxLength(1);
 
+                    b.Property<int?>("supervisor3A");
+
+                    b.Property<DateTime?>("supervisor3A_date");
+
+                    b.Property<string>("supervisor3A_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor3A_result")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor3_id");
+
                     b.Property<decimal?>("total_summary_chief");
 
                     b.Property<decimal?>("total_summary_competency_chief");
diff --git a/Models/eva_create_evaluation/eva_create_evaluationEntity.cs b/Models/eva_create_evaluation/eva_create_evaluationEntity.cs
index 7c7f903..ca629ca 100644
--- a/Models/eva_create_evaluation/eva_create_evaluationEntity.cs
+++ b/Models/eva_create_evaluation/eva_create_evaluationEntity.cs
@@ -34,6 +34,6 @@ namespace TodoAPI2.Models
 
         public int? supervisor2_id { get; set; }
 
-
+        public int? supervisor3_id { get; set; }
     }
 }
diff --git a/Models/eva_create_evaluation/eva_create_evaluationInputModel.cs b/Models/eva_create_evaluation/eva_create_evaluationInputModel.cs
index 2ecb2cb..31500d4 100644
--- a/Models/eva_create_evaluation/eva_create_evaluationInputModel.cs
+++ b/Models/eva_create_evaluation/eva_create_evaluationInputModel.cs
@@ -30,6 +30,8 @@ namespace TodoAPI2.Models
 
         public int? supervisor2_id { get; set; }
 
+        public int? supervisor3_id { get; set; }
+
         public string active_mode { get; set; }
     }
 }
diff --git a/Models/eva_create_evaluation/eva_create_evaluationService.cs b/Models/eva_create_evaluation/eva_create_evaluationService.cs
index dd3c502..5231b9d 100644
--- a/Models/eva_create_evaluation/eva_create_evaluationService.cs
+++ b/Models/eva_create_evaluation/eva_create_evaluationService.cs
@@ -76,6 +76,7 @@ namespace TodoAPI2.Models
             i.item_evaluation_group_id = (from x in _repository.Context.eva_evaluation_group select x).ToList();
             i.item_supervisor1_id = all_emp;
             i.item_supervisor2_id = all_emp;
+            i.item_supervisor3_id = all_emp;
 
             return i;
         }
@@ -89,6 +90,7 @@ namespace TodoAPI2.Models
             i.item_evaluation_group_id = (from x in _repository.Context.eva_evaluation_group select x).ToList();
             i.item_supervisor1_id = all_emp;
             i.item_supervisor2_id = all_emp;
+            i.item_supervisor3_id = all_emp;
 
             return i;
         }
@@ -127,6 +129,10 @@ namespace TodoAPI2.Models
                 into external_linkageResult7
                 from fk_external_linkageResult7 in external_linkageResult7.DefaultIfEmpty()
 
+                join fk_external_linkage8 in all_emp on m_eva_create_evaluation.supervisor3_id equals fk_external_linkage8.id
+                into external_linkageResult8
+                from fk_external_linkageResult8 in external_linkageResult8.DefaultIfEmpty()
+
                 where 1==1
                 && (m_eva_create_evaluation.performance_plan_id == model.performance_plan_id || !model.performance_plan_id.HasValue)
                 && (m_eva_create_evaluation.evaluation_group_id == model.evaluation_group_id || !model.evaluation_group_id.HasValue)
@@ -143,6 +149,7 @@ namespace TodoAPI2.Models
                     evaluation_group_id = m_eva_create_evaluation.evaluation_group_id,
                     supervisor1_id = m_eva_create_evaluation.supervisor1_id,
                     supervisor2_id = m_eva_create_evaluation.supervisor2_id,
+                    supervisor3_id = m_eva_create_evaluation.supervisor3_id,
 
                     performance_plan_id_eva_performance_plan_fiscal_year = fk_eva_performance_planResult1.display_text,
                     employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname,
@@ -150,6 +157,7 @@ namespace TodoAPI2.Models
                     evaluation_group_id_eva_evaluation_group_name = fk_eva_evaluation_groupResult5.thegroup,
                     supervisor1_id_external_linkage_external_name = fk_external_linkageResult6.fullname,
                     supervisor2_id_external_linkage_external_name = fk_external_linkageResult7.fullname,
+                    supervisor3_id_external_linkage_external_name = fk_external_linkageResult8.fullname,
 
                     isActive = m_eva_create_evaluation.isActive,
                     Created = m_eva_create_evaluation.created,
@@ -209,7 +217,7 @@ namespace TodoAPI2.Models
                 existingEntity.evaluation_group_id = model.evaluation_group_id;
                 existingEntity.supervisor1_id = model.supervisor1_id;
                 existingEntity.supervisor2_id = model.supervisor2_id;
-
+                existingEntity.supervisor3_id = model.supervisor3_id;
 
                 var updated = _repository.Update(id, existingEntity);
                 return Get(updated.id);
@@ -234,7 +242,7 @@ namespace TodoAPI2.Models
                         existingEntity.evaluation_group_id = i.evaluation_group_id;
                         existingEntity.supervisor1_id = i.supervisor1_id;
                         existingEntity.supervisor2_id = i.supervisor2_id;
-
+                        existingEntity.supervisor3_id = i.supervisor3_id;
 
                         _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
                     }
diff --git a/Models/eva_create_evaluation/eva_create_evaluationViewModel.cs b/Models/eva_create_evaluation/eva_create_evaluationViewModel.cs
index 5520c56..fd9c5e4 100644
--- a/Models/eva_create_evaluation/eva_create_evaluationViewModel.cs
+++ b/Models/eva_create_evaluation/eva_create_evaluationViewModel.cs
@@ -28,6 +28,8 @@ namespace TodoAPI2.Models
 
         public int? supervisor2_id { get; set; }
 
+        public int? supervisor3_id { get; set; }
+
         public string performance_plan_id_eva_performance_plan_fiscal_year { get; set; }
         public string employee_id_external_linkage_external_name { get; set; }
         public string evaluation_group_id_eva_evaluation_group_code { get; set; }
@@ -36,6 +38,8 @@ namespace TodoAPI2.Models
         public string supervisor1_id_external_linkage_external_name { get; set; }
         public string supervisor2_id_external_linkage_external_name { get; set; }
 
+        public string supervisor3_id_external_linkage_external_name { get; set; }
+
         public string description
         {
             get
diff --git a/Models/eva_create_evaluation/eva_create_evaluationWithSelectionViewModel.cs b/Models/eva_create_evaluation/eva_create_evaluationWithSelectionViewModel.cs
index c79f2b4..897fdb9 100644
--- a/Models/eva_create_evaluation/eva_create_evaluationWithSelectionViewModel.cs
+++ b/Models/eva_create_evaluation/eva_create_evaluationWithSelectionViewModel.cs
@@ -12,6 +12,6 @@ namespace TodoAPI2.Models
         public List<eva_evaluation_groupEntity> item_evaluation_group_id { get; set; }
         public List<external_employeeViewModel> item_supervisor1_id { get; set; }
         public List<external_employeeViewModel> item_supervisor2_id { get; set; }
-
+        public List<external_employeeViewModel> item_supervisor3_id { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs
index d8a1ce3..9946f60 100644
--- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs
+++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs
@@ -137,6 +137,8 @@ namespace TodoAPI2.Models
         public DateTime? status_supervisor1A_click_date { get; set; }
         public DateTime? status_supervisor2A_click_date { get; set; }
 
+        public DateTime? status_supervisor3A_click_date { get; set; }
+
         public decimal? total_summary_supervisor1A { get; set; }
 
         public decimal? Final_summary_supervisor1A { get; set; }
@@ -198,6 +200,20 @@ namespace TodoAPI2.Models
 
         [MaxLength(1000)]
         public string remark { get; set; }
+
+        public int? supervisor3_id { get; set; }
+
+        public int? supervisor3A { get; set; }
+
+        [MaxLength(1)]
+        public string supervisor3A_result { get; set; }
+
+        [MaxLength(1000)]
+        public string supervisor3A_remark { get; set; }
+
+        public DateTime? supervisor3A_date { get; set; }
+        [MaxLength(1)]
+        public string status_supervisor3A { get; set; }
     }
 }
 
diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailInputModel.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailInputModel.cs
index 7d405c7..dab008e 100644
--- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailInputModel.cs
+++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailInputModel.cs
@@ -36,6 +36,8 @@ namespace TodoAPI2.Models
 
         public string remark { get; set; }
 
+        public int? supervisor3_id { get; set; }
+
         public string active_mode { get; set; }
     }
 }
diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
index 4d7f0f0..59e3394 100644
--- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
+++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
@@ -82,6 +82,7 @@ namespace TodoAPI2.Models
             i.item_eva_employee_id = i.item_employee_id;
             i.item_supervisor1_id = i.item_employee_id;
             i.item_supervisor2_id = i.item_employee_id;
+            i.item_supervisor3_id = i.item_employee_id;
             i.item_help_org_id = ext.GetDepartmentData();
 
             return i;
@@ -95,6 +96,7 @@ namespace TodoAPI2.Models
             i.item_eva_employee_id = i.item_employee_id;
             i.item_supervisor1_id = i.item_employee_id;
             i.item_supervisor2_id = i.item_employee_id;
+            i.item_supervisor3_id = i.item_employee_id;
             i.item_help_org_id = ext.GetDepartmentData();
 
             return i;
@@ -139,6 +141,10 @@ namespace TodoAPI2.Models
                 into external_linkageResult46
                 from fk_external_linkageResult46 in external_linkageResult46.DefaultIfEmpty()
 
+                join fk_external_linkage48 in allemp on m_eva_create_evaluation_detail.supervisor3_id equals fk_external_linkage48.id
+                into external_linkageResult48
+                from fk_external_linkageResult48 in external_linkageResult48.DefaultIfEmpty()
+
                 join fk_external_linkage99 in ext.GetDepartmentData() on (m_eva_create_evaluation_detail.help_org_id.HasValue ? m_eva_create_evaluation_detail.help_org_id : fk_external_linkageResult2.department_id) equals fk_external_linkage99.id
                 into external_linkageResult99
                 from fk_external_linkageResult99 in external_linkageResult99.DefaultIfEmpty()
@@ -197,6 +203,7 @@ namespace TodoAPI2.Models
 
                     status_supervisor1A = m_eva_create_evaluation_detail.status_supervisor1A,
                     status_supervisor2A = m_eva_create_evaluation_detail.status_supervisor2A,
+                    status_supervisor3A = m_eva_create_evaluation_detail.status_supervisor3A,
 
                     employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname,
                     chief_external_linkage_external_name = fk_external_linkageResult3.fullname,
@@ -216,6 +223,7 @@ namespace TodoAPI2.Models
                     status_supervisor_click_date = m_eva_create_evaluation_detail.status_supervisor_click_date,
                     status_supervisor1A_click_date = m_eva_create_evaluation_detail.status_supervisor1A_click_date,
                     status_supervisor2A_click_date = m_eva_create_evaluation_detail.status_supervisor2A_click_date,
+                    status_supervisor3A_click_date = m_eva_create_evaluation_detail.status_supervisor3A_click_date,
 
                     department_name = fk_external_linkageResult99.external_name,
                     help_org_id_external_linkage_external_name = fk_external_linkageResult46.external_name,
diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs
index 690ce94..67f63bd 100644
--- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs
+++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs
@@ -82,10 +82,13 @@ namespace TodoAPI2.Models
 
         public string status_supervisor2A { get; set; }
 
+        public string status_supervisor3A { get; set; }
+
         public string employee_id_external_linkage_external_name { get; set; }
         public string chief_external_linkage_external_name { get; set; }
         public string supervisor1_result_external_linkage_external_name { get; set; }
         public string supervisor2_result_external_linkage_external_name { get; set; }
+        public string supervisor3_result_external_linkage_external_name { get; set; }
 
         public string position_type_text { get; set; }
         public string position_level_text { get; set; }
@@ -103,6 +106,7 @@ namespace TodoAPI2.Models
         public DateTime? status_supervisor_click_date { get; set; }
         public DateTime? status_supervisor1A_click_date { get; set; }
         public DateTime? status_supervisor2A_click_date { get; set; }
+        public DateTime? status_supervisor3A_click_date { get; set; }
 
         public int? eva_employee_id { get; set; }
 
@@ -110,6 +114,8 @@ namespace TodoAPI2.Models
 
         public int? supervisor2_id { get; set; }
 
+        public int? supervisor3_id { get; set; }
+
         public decimal? work_period { get; set; }
         public int? order_of_data { get; set; }
 
@@ -120,6 +126,7 @@ namespace TodoAPI2.Models
         public string txt_status_supervisor { get { return getStatusText(status_supervisor) + MyHelper.GetDateStringForReport(status_supervisor_click_date); } }
         public string txt_status_supervisor1A { get { return getStatusText(status_supervisor1A) + MyHelper.GetDateStringForReport(status_supervisor1A_click_date); } }
         public string txt_status_supervisor2A { get { return getStatusText(status_supervisor2A) + MyHelper.GetDateStringForReport(status_supervisor2A_click_date); } }
+        public string txt_status_supervisor3A { get { return getStatusText(status_supervisor3A) + MyHelper.GetDateStringForReport(status_supervisor3A_click_date); } }
 
         public string help_org_id_external_linkage_external_name { get; set; }
 
diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailWithSelectionViewModel.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailWithSelectionViewModel.cs
index 329fb6c..9981bb5 100644
--- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailWithSelectionViewModel.cs
+++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailWithSelectionViewModel.cs
@@ -13,6 +13,7 @@ namespace TodoAPI2.Models
         public List<external_employeeViewModel> item_eva_employee_id { get; set; }
         public List<external_employeeViewModel> item_supervisor1_id { get; set; }
         public List<external_employeeViewModel> item_supervisor2_id { get; set; }
+        public List<external_employeeViewModel> item_supervisor3_id { get; set; }
         public List<external_linkageViewModel> item_help_org_id { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
index 7c27821..a2f27d1 100644
--- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
+++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
@@ -140,7 +140,9 @@ namespace TodoAPI2.Models
                 into external_supervisor2AResult
                 from fk_external_supervisor2A in external_supervisor2AResult.DefaultIfEmpty()
 
-
+                join fk_external_supervisor3A in allemp on isNull<int?>(m_eva_create_evaluation_detail_process.supervisor3_id, fk_eva_create_evaluationResult10.supervisor3_id) equals fk_external_supervisor3A.id
+                into external_supervisor3AResult
+                from fk_external_supervisor3A in external_supervisor3AResult.DefaultIfEmpty()
 
                 where m_eva_create_evaluation_detail_process.id == id
 
@@ -173,6 +175,8 @@ namespace TodoAPI2.Models
                     supervisor1A_position = fk_external_supervisor1A.position_name,
                     supervisor2A_fullname = fk_external_supervisor2A.fullname,
                     supervisor2A_position = fk_external_supervisor2A.position_name,
+                    supervisor3A_fullname = fk_external_supervisor3A.fullname,
+                    supervisor3A_position = fk_external_supervisor3A.position_name,
 
                     org_id_external_linkage_external_name = fk_external_employee.department_name,
 
@@ -185,6 +189,7 @@ namespace TodoAPI2.Models
 
                     status_supervisor1A = m_eva_create_evaluation_detail_process.status_supervisor1A,
                     status_supervisor2A = m_eva_create_evaluation_detail_process.status_supervisor2A,
+                    status_supervisor3A = m_eva_create_evaluation_detail_process.status_supervisor3A,
 
                     role_code = getRoleCode(emp_id, m_eva_create_evaluation_detail_process.chief,
                     m_eva_create_evaluation_detail_process.chief,
@@ -218,12 +223,14 @@ namespace TodoAPI2.Models
                     supervisor2_position_type_id = fk_external_supervisor2.position_type_id,
                     supervisor1A_position_type_id = fk_external_supervisor1A.position_type_id,
                     supervisor2A_position_type_id = fk_external_supervisor2A.position_type_id,
+                    supervisor3A_position_type_id = fk_external_supervisor3A.position_type_id,
                     employee_position_type_id = fk_external_employee.position_type_id,
                     chief_position_type_id = fk_external_chief.position_type_id,
 
                     supervisor2_position_level_text = fk_external_supervisor2.position_level_text,
                     supervisor1A_position_level_text = fk_external_supervisor1A.position_level_text,
                     supervisor2A_position_level_text = fk_external_supervisor2A.position_level_text,
+                    supervisor3A_position_level_text = fk_external_supervisor3A.position_level_text,
                     employee_position_level_text = fk_external_employee.position_level_text,
                     chief_position_level_text = fk_external_chief.position_level_text,
 
diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs
index a1cce42..bd9d95a 100644
--- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs
+++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs
@@ -49,6 +49,10 @@ namespace TodoAPI2.Models
 
         public string supervisor2A_position { get; set; }
 
+        public string supervisor3A_fullname { get; set; }
+
+        public string supervisor3A_position { get; set; }
+
         public int? create_evaluation_id { get; set; }
 
         public int? org_id { get; set; }
@@ -70,6 +74,8 @@ namespace TodoAPI2.Models
 
         public string status_supervisor2A { get; set; }
 
+        public string status_supervisor3A { get; set; }
+
         public string role_desc { get; set; }
 
         public string role_code { get; set; }
@@ -87,11 +93,14 @@ namespace TodoAPI2.Models
         public DateTime? status_supervisor1A_click_date { get; set; }
         public DateTime? status_supervisor2A_click_date { get; set; }
 
+        public DateTime? status_supervisor3A_click_date { get; set; }
+
         public string txt_status_self { get { return getStatusText(status_self) + MyHelper.GetDateStringForReport(status_self_click_date) + " " + MyHelper.GetTimeStringFromDate(status_self_click_date) + getHistoryLink(status_self); } }
         public string txt_status_chief { get { return getStatusText(status_chief) + MyHelper.GetDateStringForReport(status_chief_click_date) + " " + MyHelper.GetTimeStringFromDate(status_chief_click_date) + getHistoryLink(status_chief); } }
         public string txt_status_supervisor { get { return getStatusText(status_supervisor) + MyHelper.GetDateStringForReport(status_supervisor_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor_click_date) + getHistoryLink(status_supervisor); } }
         public string txt_status_supervisor1A { get { return getStatusText(status_supervisor1A) + MyHelper.GetDateStringForReport(status_supervisor1A_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor1A_click_date) + getHistoryLink(status_supervisor1A); } }
         public string txt_status_supervisor2A { get { return getStatusText(status_supervisor2A) + MyHelper.GetDateStringForReport(status_supervisor2A_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor2A_click_date) + getHistoryLink(status_supervisor2A); } }
+        public string txt_status_supervisor3A { get { return getStatusText(status_supervisor3A) + MyHelper.GetDateStringForReport(status_supervisor3A_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor3A_click_date) + getHistoryLink(status_supervisor3A); } }
 
         private string getHistoryLink(string s)
         {
diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs
index 1b069eb..0e7a267 100644
--- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs
+++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs
@@ -29,12 +29,14 @@ namespace TodoAPI2.Models
         public int? supervisor2_position_type_id { get; set; }
         public int? supervisor1A_position_type_id { get; set; }
         public int? supervisor2A_position_type_id { get; set; }
+        public int? supervisor3A_position_type_id { get; set; }
         public int? employee_position_type_id { get; set; }
         public int? chief_position_type_id { get; set; }
 
         public string supervisor2_position_level_text { get; set; }
         public string supervisor1A_position_level_text { get; set; }
         public string supervisor2A_position_level_text { get; set; }
+        public string supervisor3A_position_level_text { get; set; }
         public string employee_position_level_text { get; set; }
         public string chief_position_level_text { get; set; }
 
diff --git a/Views/eva_create_evaluationView/eva_create_evaluation.cshtml b/Views/eva_create_evaluationView/eva_create_evaluation.cshtml
index aa93003..319f6c1 100644
--- a/Views/eva_create_evaluationView/eva_create_evaluation.cshtml
+++ b/Views/eva_create_evaluationView/eva_create_evaluation.cshtml
@@ -45,6 +45,11 @@
                                 <label id="lab_eva_create_evaluation_supervisor2_id" for="eva_create_evaluation_supervisor2_id">ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)</label>
                                 <select class="form-control" id="eva_create_evaluation_supervisor2_id" iLabel="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)" iRequire="false" iGroup="eva_create_evaluation"></select>
                             </div>
+
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_create_evaluation_supervisor3_id" for="eva_create_evaluation_supervisor3_id">ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (พิเศษ)</label>
+                                <select class="form-control" id="eva_create_evaluation_supervisor3_id" iLabel="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (พิเศษ)" iRequire="false" iGroup="eva_create_evaluation"></select>
+                            </div>
                         </div>
 
                         <div class='row'>
@@ -123,12 +128,12 @@
             </thead>
             <tbody></tbody>
         </table>
-        </div>
+    </div>
 </section>
 
 @section FooterPlaceHolder{
-    <script src="~/js/eva_create_evaluation/eva_create_evaluation.js?version=@MyHelper.GetDummyText()"></script>
-    <script>
+<script src="~/js/eva_create_evaluation/eva_create_evaluation.js?version=@MyHelper.GetDummyText()"></script>
+<script>
     $(document).ready(function () {
         eva_create_evaluation_InitiateDataTable();
         eva_create_evaluation_InitialForm();
@@ -142,9 +147,12 @@
         $("#eva_create_evaluation_supervisor2_id").select2({
             dropdownParent: $('#eva_create_evaluationModel')
         });
+        $("#eva_create_evaluation_supervisor3_id").select2({
+            dropdownParent: $('#eva_create_evaluationModel')
+        });
         $("#eva_create_evaluation_detail_employee_id").select2();
         $("#eva_create_evaluation_detail_chief").select2();
     });
-    </script>
+</script>
 }
 
diff --git a/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml b/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml
index 014bd3c..b1f9445 100644
--- a/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml
+++ b/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml
@@ -50,8 +50,16 @@
                                 <label id="lab_eva_create_evaluation_detail_supervisor2_id" for="eva_create_evaluation_detail_supervisor2_id">ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)</label>
                                 <select class="form-control" id="eva_create_evaluation_detail_supervisor2_id" iLabel="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)" iRequire="false" iGroup="eva_create_evaluation_detail"></select>
                             </div>
+
+                            <div class="form-group col-md-4">
+	    <label id="lab_eva_create_evaluation_detail_supervisor3_id" for="eva_create_evaluation_detail_supervisor3_id">ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (พิเศษ)</label>
+	    <select class="form-control" id="eva_create_evaluation_detail_supervisor3_id" iLabel="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (พิเศษ)" iRequire="false" iGroup="eva_create_evaluation_detail" ></select>
+    </div>
                         </div>
                         <div class='row'>
+
+                            
+
                             <div class="form-group col-md-4">
                                 <label id="lab_eva_create_evaluation_detail_work_period" for="eva_create_evaluation_detail_work_period">ระยะเวลาทำงาน ในรอบการประเมินนี้ (เดือน)</label>
                                 <input class="form-control" type="number" id="eva_create_evaluation_detail_work_period" iLabel="ระยะเวลาทำงาน ในรอบการประเมินนี้ (เดือน)" iRequire="false" iGroup="eva_create_evaluation_detail" />
@@ -159,6 +167,11 @@
                             <label id="lab_eva_create_evaluation_supervisor2_id" for="eva_create_evaluation_supervisor2_id">ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)</label>
                             <select class="form-control" id="eva_create_evaluation_supervisor2_id" iLabel="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)" iRequire="false" iGroup="eva_create_evaluation"></select>
                         </div>
+
+                        <div class="form-group col-md-4">
+                                <label id="lab_eva_create_evaluation_supervisor3_id" for="eva_create_evaluation_supervisor3_id">ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (พิเศษ)</label>
+                                <select class="form-control" id="eva_create_evaluation_supervisor3_id" iLabel="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (พิเศษ)" iRequire="false" iGroup="eva_create_evaluation"></select>
+                            </div>
                     </div>
 
                     <div class='row'>
@@ -238,50 +251,55 @@
 </section>
 
 @section FooterPlaceHolder{
-    <script src="~/js/eva_create_evaluation/eva_create_evaluation_d.js?version=@MyHelper.GetDummyText()"></script>
-    <script src="~/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js?version=@MyHelper.GetDummyText()"></script>
-    <script>
-        $(document).ready(function () {
-            var id = getUrlParameter("id");
-            if (id) {
-                eva_create_evaluation_SetEditForm(id);
-                eva_create_evaluation_detail_InitiateDataTable(id);
-                eva_create_evaluation_detail_InitialForm();
-                SetupValidationRemark("eva_create_evaluation_detail");
-            } else {
-                eva_create_evaluation_SetCreateForm();
-            }
-            SetupValidationRemark("eva_create_evaluation");
-            $("#eva_create_evaluation_employee_id").select2();
-            $("#eva_create_evaluation_supervisor1_id").select2();
-            $("#eva_create_evaluation_supervisor2_id").select2();
-            $("#eva_create_evaluation_detail_employee_id").select2({
-                dropdownParent: $('#eva_create_evaluation_detailModel')
-            });
-            $("#eva_create_evaluation_detail_chief").select2({
-                dropdownParent: $('#eva_create_evaluation_detailModel')
-            });
-            $("#eva_create_evaluation_detail_eva_employee_id").select2({
-                dropdownParent: $('#eva_create_evaluation_detailModel')
-            });
-            $("#eva_create_evaluation_detail_supervisor1_id").select2({
-                dropdownParent: $('#eva_create_evaluation_detailModel')
-            });
-            $("#eva_create_evaluation_detail_supervisor2_id").select2({
-                dropdownParent: $('#eva_create_evaluation_detailModel')
-            });
-        });
-
-        function go_next() {
-            var id = getUrlParameter("id");
-            window.location = "eva_create_evaluation_d_summary?id=" + id;
+<script src="~/js/eva_create_evaluation/eva_create_evaluation_d.js?version=@MyHelper.GetDummyText()"></script>
+<script src="~/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js?version=@MyHelper.GetDummyText()"></script>
+<script>
+    $(document).ready(function () {
+        var id = getUrlParameter("id");
+        if (id) {
+            eva_create_evaluation_SetEditForm(id);
+            eva_create_evaluation_detail_InitiateDataTable(id);
+            eva_create_evaluation_detail_InitialForm();
+            SetupValidationRemark("eva_create_evaluation_detail");
+        } else {
+            eva_create_evaluation_SetCreateForm();
         }
+        SetupValidationRemark("eva_create_evaluation");
+        $("#eva_create_evaluation_employee_id").select2();
+        $("#eva_create_evaluation_supervisor1_id").select2();
+        $("#eva_create_evaluation_supervisor2_id").select2();
+        $("#eva_create_evaluation_supervisor3_id").select2();
 
-    </script>
+        $("#eva_create_evaluation_detail_employee_id").select2({
+            dropdownParent: $('#eva_create_evaluation_detailModel')
+        });
+        $("#eva_create_evaluation_detail_chief").select2({
+            dropdownParent: $('#eva_create_evaluation_detailModel')
+        });
+        $("#eva_create_evaluation_detail_eva_employee_id").select2({
+            dropdownParent: $('#eva_create_evaluation_detailModel')
+        });
+        $("#eva_create_evaluation_detail_supervisor1_id").select2({
+            dropdownParent: $('#eva_create_evaluation_detailModel')
+        });
+        $("#eva_create_evaluation_detail_supervisor2_id").select2({
+            dropdownParent: $('#eva_create_evaluation_detailModel')
+        });
+        $("#eva_create_evaluation_detail_supervisor3_id").select2({
+            dropdownParent: $('#eva_create_evaluation_detailModel')
+        });
+    });
+
+    function go_next() {
+        var id = getUrlParameter("id");
+        window.location = "eva_create_evaluation_d_summary?id=" + id;
+    }
+
+</script>
 }
 
 @section HeadPlaceHolder{
-    <link href="~/BackendScript/css/step.css" rel="stylesheet">
+<link href="~/BackendScript/css/step.css" rel="stylesheet">
 }
 
 
diff --git a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml
index b6f88fb..66e0ff1 100644
--- a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml
+++ b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml
@@ -79,6 +79,7 @@
                     <th><label>สถานะทำแบบประเมิน<br />(ผู้ประเมินสูงสุด)</label></th>
                     <th><label>สถานะตรวจสอบ<br />(ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง)</label></th>
                     <th><label>สถานะตรวจสอบ<br />(ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด))</label></th>
+                    <th><label>สถานะตรวจสอบ<br />(ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง (พิเศษ))</label></th>
                 </tr>
             </thead>
             <tbody></tbody>
diff --git a/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js b/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js
index f700472..a0d18a1 100644
--- a/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js
+++ b/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js
@@ -28,6 +28,7 @@ function eva_create_evaluation_FeedDataToForm(data) {
     DropDownClearFormAndFeedWithData($("#eva_create_evaluation_evaluation_group_id"), data, "id", "thegroup", "item_evaluation_group_id", data.evaluation_group_id);
     DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor1_id"), data, "id", "fullname", "item_supervisor1_id", data.supervisor1_id);
     DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor2_id"), data, "id", "fullname", "item_supervisor2_id", data.supervisor2_id);
+    DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor3_id"), data, "id", "fullname", "item_supervisor3_id", data.supervisor3_id);
 
 }
 
@@ -41,6 +42,7 @@ function eva_create_evaluation_GetFromForm() {
     eva_create_evaluationObject.evaluation_group_id = $("#eva_create_evaluation_evaluation_group_id").val();
     eva_create_evaluationObject.supervisor1_id = $("#eva_create_evaluation_supervisor1_id").val();
     eva_create_evaluationObject.supervisor2_id = $("#eva_create_evaluation_supervisor2_id").val();
+    eva_create_evaluationObject.supervisor3_id = $("#eva_create_evaluation_supervisor3_id").val();
 
     return eva_create_evaluationObject;
 }
diff --git a/wwwroot/js/eva_create_evaluation/eva_create_evaluation_d.js b/wwwroot/js/eva_create_evaluation/eva_create_evaluation_d.js
index 07005e6..a9a3e5d 100644
--- a/wwwroot/js/eva_create_evaluation/eva_create_evaluation_d.js
+++ b/wwwroot/js/eva_create_evaluation/eva_create_evaluation_d.js
@@ -12,6 +12,7 @@ function eva_create_evaluation_FeedDataToForm(data) {
     DropDownClearFormAndFeedWithData($("#eva_create_evaluation_evaluation_group_id"), data, "id", "thegroup", "item_evaluation_group_id", data.evaluation_group_id);
     DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor1_id"), data, "id", "fullname", "item_supervisor1_id", data.supervisor1_id);
     DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor2_id"), data, "id", "fullname", "item_supervisor2_id", data.supervisor2_id);
+    DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor3_id"), data, "id", "fullname", "item_supervisor3_id", data.supervisor3_id);
 
 }
 
@@ -25,6 +26,7 @@ function eva_create_evaluation_GetFromForm() {
     eva_create_evaluationObject.evaluation_group_id = $("#eva_create_evaluation_evaluation_group_id").val();
     eva_create_evaluationObject.supervisor1_id = $("#eva_create_evaluation_supervisor1_id").val();
     eva_create_evaluationObject.supervisor2_id = $("#eva_create_evaluation_supervisor2_id").val();
+    eva_create_evaluationObject.supervisor3_id = $("#eva_create_evaluation_supervisor3_id").val();
 
     return eva_create_evaluationObject;
 }
diff --git a/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js b/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js
index fa01752..f783816 100644
--- a/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js
+++ b/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js
@@ -29,6 +29,7 @@ function eva_create_evaluation_detail_FeedDataToForm(data) {
     $("#eva_create_evaluation_detail_order_of_data").val(data.order_of_data);
     DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_help_org_id"), data, "id", "external_name", "item_help_org_id", data.help_org_id);
     $("#eva_create_evaluation_detail_remark").val(data.remark);
+    DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_supervisor3_id"), data, "id", "fullname", "item_supervisor3_id", data.supervisor3_id);
 }
 
 function eva_create_evaluation_detail_GetFromForm() {
@@ -44,6 +45,7 @@ function eva_create_evaluation_detail_GetFromForm() {
     eva_create_evaluation_detailObject.order_of_data = $("#eva_create_evaluation_detail_order_of_data").val();
     eva_create_evaluation_detailObject.help_org_id = $("#eva_create_evaluation_detail_help_org_id").val();
     eva_create_evaluation_detailObject.remark = $("#eva_create_evaluation_detail_remark").val();
+    eva_create_evaluation_detailObject.supervisor3_id = $("#eva_create_evaluation_detail_supervisor3_id").val();
 
     return eva_create_evaluation_detailObject;
 }
diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js
index fde15fa..3217ce1 100644
--- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js
+++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js
@@ -206,7 +206,8 @@ var eva_create_evaluation_detail_process_setupTable = function (result) {
             { "data": "txt_status_chief" },
             { "data": "txt_status_supervisor" },
             { "data": "txt_status_supervisor1A" },
-            { "data": "txt_status_supervisor2A" }
+            { "data": "txt_status_supervisor2A" },
+            { "data": "txt_status_supervisor3A" }
         ],
         "columnDefs": [
             {
@@ -230,7 +231,7 @@ var eva_create_evaluation_detail_process_setupTable = function (result) {
             api.column(groupColumn, { page: 'current' }).data().each(function (group, i) {
                 if (last !== group) {
                     $(rows).eq(i).before(
-                        '<tr class="group"><td colspan="12">' + group + '</td></tr>'
+                        '<tr class="group"><td colspan="13">' + group + '</td></tr>'
                     );
 
                     last = group;