diff --git a/EXCEL/eva_adjust_postponement_detail.xlsx b/EXCEL/eva_adjust_postponement_detail.xlsx
index dbed5e3..b84fc23 100644
Binary files a/EXCEL/eva_adjust_postponement_detail.xlsx and b/EXCEL/eva_adjust_postponement_detail.xlsx differ
diff --git a/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_normal.xlsx b/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_normal.xlsx
index ddf2d15..aeed615 100644
Binary files a/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_normal.xlsx and b/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_normal.xlsx differ
diff --git a/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_normal_02.xlsx b/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_normal_02.xlsx
index 02c8e2f..6134efd 100644
Binary files a/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_normal_02.xlsx and b/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_normal_02.xlsx differ
diff --git a/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_quota.xlsx b/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_quota.xlsx
index d767219..b526fa9 100644
Binary files a/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_quota.xlsx and b/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_quota.xlsx differ
diff --git a/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_quota_02.xlsx b/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_quota_02.xlsx
index 1395cb8..6ec85d2 100644
Binary files a/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_quota_02.xlsx and b/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_quota_02.xlsx differ
diff --git a/Migrations/20211005133544_AddRewardSalary.Designer.cs b/Migrations/20211005133544_AddRewardSalary.Designer.cs
new file mode 100644
index 0000000..45283a7
--- /dev/null
+++ b/Migrations/20211005133544_AddRewardSalary.Designer.cs
@@ -0,0 +1,1096 @@
+// <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("20211005133544_AddRewardSalary")]
+    partial class AddRewardSalary
+    {
+        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(4000);
+
+                    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(8000);
+
+                    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_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<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<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(8000);
+
+                    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_behaviorEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("behavior")
+                        .HasMaxLength(1000);
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("score");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<decimal?>("score3");
+
+                    b.Property<decimal?>("score4");
+
+                    b.Property<decimal?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    b.Property<decimal?>("sumary3");
+
+                    b.Property<decimal?>("sumary4");
+
+                    b.Property<string>("target_score1")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score2")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score3")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score4")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score5")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("weight");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_behavior");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_groupEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<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_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_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_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_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/20211005133544_AddRewardSalary.cs b/Migrations/20211005133544_AddRewardSalary.cs
new file mode 100644
index 0000000..b869140
--- /dev/null
+++ b/Migrations/20211005133544_AddRewardSalary.cs
@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace tb320eva.Migrations
+{
+    public partial class AddRewardSalary : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<decimal>(
+                name: "reward_new",
+                table: "eva_adjust_postponement_detail",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "reward_old",
+                table: "eva_adjust_postponement_detail",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "reward_new",
+                table: "eva_adjust_postponement_detail");
+
+            migrationBuilder.DropColumn(
+                name: "reward_old",
+                table: "eva_adjust_postponement_detail");
+        }
+    }
+}
diff --git a/Migrations/20211005143227_AddRewardSalary2.Designer.cs b/Migrations/20211005143227_AddRewardSalary2.Designer.cs
new file mode 100644
index 0000000..a30a29e
--- /dev/null
+++ b/Migrations/20211005143227_AddRewardSalary2.Designer.cs
@@ -0,0 +1,1098 @@
+// <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("20211005143227_AddRewardSalary2")]
+    partial class AddRewardSalary2
+    {
+        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(4000);
+
+                    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(8000);
+
+                    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<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<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(8000);
+
+                    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_behaviorEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("behavior")
+                        .HasMaxLength(1000);
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("score");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<decimal?>("score3");
+
+                    b.Property<decimal?>("score4");
+
+                    b.Property<decimal?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    b.Property<decimal?>("sumary3");
+
+                    b.Property<decimal?>("sumary4");
+
+                    b.Property<string>("target_score1")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score2")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score3")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score4")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score5")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("weight");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_behavior");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_groupEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<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_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_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_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_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/20211005143227_AddRewardSalary2.cs b/Migrations/20211005143227_AddRewardSalary2.cs
new file mode 100644
index 0000000..07a37f2
--- /dev/null
+++ b/Migrations/20211005143227_AddRewardSalary2.cs
@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace tb320eva.Migrations
+{
+    public partial class AddRewardSalary2 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<decimal>(
+                name: "reward_new2",
+                table: "eva_adjust_postponement_detail",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "reward_new2",
+                table: "eva_adjust_postponement_detail");
+        }
+    }
+}
diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs
index bc7b270..54ef167 100644
--- a/Migrations/DataContextModelSnapshot.cs
+++ b/Migrations/DataContextModelSnapshot.cs
@@ -171,6 +171,12 @@ namespace tb320eva.Migrations
                     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");
diff --git a/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs b/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs
index 2d99504..447aaec 100644
--- a/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs
+++ b/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs
@@ -81,6 +81,12 @@ namespace TodoAPI2.Models
         public string employee_no_at_this_time { get; set; }
 
         public bool? is_for_postponement { get; set; }
+
+        public decimal? reward_old { get; set; }
+
+        public decimal? reward_new { get; set; }
+
+        public decimal? reward_new2 { get; set; }
     }
 }
 
diff --git a/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalInputModel.cs b/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalInputModel.cs
index e9f8bdc..e7a4697 100644
--- a/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalInputModel.cs
+++ b/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalInputModel.cs
@@ -48,6 +48,10 @@ namespace TodoAPI2.Models
 
         public string eva_result { get; set; }
 
+        public decimal? reward_old { get; set; }
+
+        public decimal? reward_new { get; set; }
+
         public string active_mode { get; set; }
     }
 }
diff --git a/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalService.cs b/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalService.cs
index b89778f..f542ce8 100644
--- a/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalService.cs
+++ b/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalService.cs
@@ -141,9 +141,15 @@ namespace TodoAPI2.Models
                     adjust_postponement_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult1.fiscal_year,
                     employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname,
 
+                    reward_old = m_eva_adjust_postponement_detail_normal.reward_old,
+                    reward_new = m_eva_adjust_postponement_detail_normal.reward_new,
+
                     isActive = m_eva_adjust_postponement_detail_normal.isActive,
                     Created = m_eva_adjust_postponement_detail_normal.created,
-                    Updated = m_eva_adjust_postponement_detail_normal.updated
+                    Updated = m_eva_adjust_postponement_detail_normal.updated,
+
+                    salary_max = fk_external_linkageResult2.salary_max,
+                    themax = fk_external_linkageResult2.themax
                 }
             ).ToList();
 
@@ -203,6 +209,8 @@ namespace TodoAPI2.Models
                 //existingEntity.emp_level = model.emp_level;
                 //existingEntity.total_score = model.total_score;
                 //existingEntity.eva_result = model.eva_result;
+                existingEntity.reward_old = model.reward_old;
+                existingEntity.reward_new = model.reward_new;
 
 
                 var updated = _repository.Update(id, existingEntity);
@@ -467,6 +475,8 @@ namespace TodoAPI2.Models
                         //existingEntity.emp_level = i.emp_level;
                         //existingEntity.total_score = i.total_score;
                         //existingEntity.eva_result = i.eva_result;
+                        existingEntity.reward_old = i.reward_old;
+                        existingEntity.reward_new = i.reward_new;
 
 
                         _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
diff --git a/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalViewModel.cs b/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalViewModel.cs
index f7f56d9..89c4d0a 100644
--- a/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalViewModel.cs
+++ b/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalViewModel.cs
@@ -50,8 +50,14 @@ namespace TodoAPI2.Models
 
         public string eva_result { get; set; }
 
+        public decimal? reward_old { get; set; }
+
+        public decimal? reward_new { get; set; }
+
         public int? adjust_postponement_id_eva_adjust_postponement_fiscal_year { get; set; }
         public string employee_id_external_linkage_external_name { get; set; }
+        public decimal? salary_max { get; set; }
 
+        public decimal? themax { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02InputModel.cs b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02InputModel.cs
index 7500920..500868b 100644
--- a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02InputModel.cs
+++ b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02InputModel.cs
@@ -48,6 +48,10 @@ namespace TodoAPI2.Models
 
         public string eva_result { get; set; }
 
+        public decimal? reward_old { get; set; }
+
+        public decimal? reward_new { get; set; }
+
         public string active_mode { get; set; }
 
 
diff --git a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs
index 21ea622..2127403 100644
--- a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs
+++ b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs
@@ -265,7 +265,8 @@ namespace TodoAPI2.Models
                 //existingEntity.emp_level = model.emp_level;
                 //existingEntity.total_score = model.total_score;
                 //existingEntity.eva_result = model.eva_result;
-
+                existingEntity.reward_old = model.reward_old;
+                existingEntity.reward_new = model.reward_new;
 
                 var updated = _repository.Update(id, existingEntity);
                 return Get(updated.id);
@@ -299,7 +300,8 @@ namespace TodoAPI2.Models
                         //existingEntity.emp_level = i.emp_level;
                         //existingEntity.total_score = i.total_score;
                         //existingEntity.eva_result = i.eva_result;
-
+                        existingEntity.reward_old = i.reward_old;
+                        existingEntity.reward_new = i.reward_new;
 
                         _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
                     }
diff --git a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02ViewModel.cs b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02ViewModel.cs
index 4c5ce91..4c26d6f 100644
--- a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02ViewModel.cs
+++ b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02ViewModel.cs
@@ -63,5 +63,9 @@ namespace TodoAPI2.Models
 
         public decimal? salary_max { get; set; }
         public decimal? themax { get; set; }
+
+        public decimal? reward_old { get; set; }
+
+        public decimal? reward_new { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02InputModel.cs b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02InputModel.cs
index 586aec2..5075341 100644
--- a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02InputModel.cs
+++ b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02InputModel.cs
@@ -52,6 +52,10 @@ namespace TodoAPI2.Models
 
         public string eva_result { get; set; }
 
+        public decimal? reward_old { get; set; }
+
+        public decimal? reward_new2 { get; set; }
+
         public string active_mode { get; set; }
     }
 }
diff --git a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs
index aa5efb2..106dfc7 100644
--- a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs
+++ b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs
@@ -20,16 +20,16 @@ namespace TodoAPI2.Models
     public class eva_adjust_postponement_detail_quota_02Service : Ieva_adjust_postponement_detail_quota_02Service
     {
         private IBaseRepository2<eva_adjust_postponement_detailEntity, int> _repository;
-		private IMyDatabase db;
-		private Iexternal_linkageService ext;
+        private IMyDatabase db;
+        private Iexternal_linkageService ext;
         private Iexternal_employeeService emp;
 
-        public eva_adjust_postponement_detail_quota_02Service(IBaseRepository2<eva_adjust_postponement_detailEntity, int> repository, 
+        public eva_adjust_postponement_detail_quota_02Service(IBaseRepository2<eva_adjust_postponement_detailEntity, int> repository,
             IMyDatabase mydb, Iexternal_linkageService inext, Iexternal_employeeService inemp)
         {
             _repository = repository;
-			db = mydb;
-			ext = inext;
+            db = mydb;
+            ext = inext;
             emp = inemp;
         }
 
@@ -50,7 +50,7 @@ namespace TodoAPI2.Models
         {
             return Mapper.Map<List<eva_adjust_postponement_detail_quota_02ViewModel>>(entities);
         }
-       
+
         #endregion
 
         #region Public Functions
@@ -80,13 +80,13 @@ namespace TodoAPI2.Models
 
         public List<eva_adjust_postponement_detail_quota_02ViewModel> GetListByadjust_postponement_quota_id(int? adjust_postponement_quota_id)
         {
-			var model = new eva_adjust_postponement_detail_quota_02SearchModel();
+            var model = new eva_adjust_postponement_detail_quota_02SearchModel();
             model.adjust_postponement_quota_id = adjust_postponement_quota_id;
             return GetListBySearch(model);
         }
 
         public string GetWorkTimeText(DateTime? startDate, DateTime? endDate)
-        {            
+        {
             if (!endDate.HasValue || !startDate.HasValue)
                 return "";
 
@@ -98,7 +98,7 @@ namespace TodoAPI2.Models
             return "";
         }
 
-		public List<eva_adjust_postponement_detail_quota_02ViewModel> GetListBySearch(eva_adjust_postponement_detail_quota_02SearchModel model)
+        public List<eva_adjust_postponement_detail_quota_02ViewModel> GetListBySearch(eva_adjust_postponement_detail_quota_02SearchModel model)
         {
             var all_emp = emp.GetListByemployee_type(null, null);
 
@@ -112,10 +112,10 @@ namespace TodoAPI2.Models
                             into eva_adjust_postponementResult1A
                            from fk_eva_adjust_postponementResult1A in eva_adjust_postponementResult1A.DefaultIfEmpty()
 
-                           //join create_detail in _repository.Context.eva_create_evaluation_detail
-                           // on fk_eva_adjust_postponementResult1A.create_evaluation_id equals create_detail.create_evaluation_id
-                           // into create_detailResult
-                           //from fk_create_detailResult in create_detailResult.DefaultIfEmpty()
+                               //join create_detail in _repository.Context.eva_create_evaluation_detail
+                               // on fk_eva_adjust_postponementResult1A.create_evaluation_id equals create_detail.create_evaluation_id
+                               // into create_detailResult
+                               //from fk_create_detailResult in create_detailResult.DefaultIfEmpty()
 
                            join create_data in _repository.Context.eva_create_evaluation
                            on fk_eva_adjust_postponementResult1A.create_evaluation_id equals create_data.id
@@ -142,12 +142,12 @@ namespace TodoAPI2.Models
 
                 join fk_external_linkage2 in all_emp on m_eva_adjust_postponement_detail_quota_02.employee_id equals fk_external_linkage2.id
                 into external_linkageResult2
-                from fk_external_linkageResult2 in external_linkageResult2.DefaultIfEmpty()                
+                from fk_external_linkageResult2 in external_linkageResult2.DefaultIfEmpty()
 
-                //join create_detail in _repository.Context.eva_create_evaluation_detail
-                //on fk_eva_adjust_postponementResult1A.create_evaluation_id equals create_detail.create_evaluation_id
-                //into create_detailResult
-                //from fk_create_detailResult in create_detailResult.DefaultIfEmpty()
+                    //join create_detail in _repository.Context.eva_create_evaluation_detail
+                    //on fk_eva_adjust_postponementResult1A.create_evaluation_id equals create_detail.create_evaluation_id
+                    //into create_detailResult
+                    //from fk_create_detailResult in create_detailResult.DefaultIfEmpty()
 
                 join sort_dep in ext.GetSortingDep() on m_eva_adjust_postponement_detail_quota_02.org_at_this_time.HasValue ? m_eva_adjust_postponement_detail_quota_02.org_at_this_time : fk_external_linkageResult2.department_id equals sort_dep.id
                 into sort_depResult2
@@ -162,7 +162,7 @@ namespace TodoAPI2.Models
                 into external_linkageResult11
                 from fk_external_linkageResult11 in sort_depResult2.DefaultIfEmpty()
 
-                where 1==1
+                where 1 == 1
                 //&& (m_eva_adjust_postponement_detail_quota_02.id == model.id || !model.id.HasValue)
                 && (m_eva_adjust_postponement_detail_quota_02.adjust_postponement_quota_id == model.adjust_postponement_quota_id || !model.adjust_postponement_quota_id.HasValue)
                 //&& (fk_create_detailResult.employee_id == m_eva_adjust_postponement_detail_quota_02.employee_id || fk_create_detailResult == null)
@@ -203,7 +203,7 @@ namespace TodoAPI2.Models
 
                     emp_department_name = !string.IsNullOrEmpty(fk_external_linkageResult11.external_name) ? fk_external_linkageResult11.external_name : fk_sort_depResult2.external_name,
 
-                    total_score = m_eva_adjust_postponement_detail_quota_02.migration_total_score.HasValue? m_eva_adjust_postponement_detail_quota_02.migration_total_score : m_eva_adjust_postponement_detail_quota_02.score_final,
+                    total_score = m_eva_adjust_postponement_detail_quota_02.migration_total_score.HasValue ? m_eva_adjust_postponement_detail_quota_02.migration_total_score : m_eva_adjust_postponement_detail_quota_02.score_final,
                     eva_result = !string.IsNullOrEmpty(m_eva_adjust_postponement_detail_quota_02.migration_eva_result) ? m_eva_adjust_postponement_detail_quota_02.migration_eva_result : m_eva_adjust_postponement_detail_quota_02.level_score_final,
 
                     adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult1.fiscal_year,
@@ -213,9 +213,16 @@ namespace TodoAPI2.Models
                     startDate = fk_external_linkageResult2.packing_date,
                     endDate = endDate,
 
+                    reward_old = m_eva_adjust_postponement_detail_quota_02.reward_old,
+                    reward_new2 = m_eva_adjust_postponement_detail_quota_02.reward_new2,
+
+                    salary_max = fk_external_linkageResult2.salary_max,
+                    themax = fk_external_linkageResult2.themax,
+
                     isActive = m_eva_adjust_postponement_detail_quota_02.isActive,
                     Created = m_eva_adjust_postponement_detail_quota_02.created,
                     Updated = m_eva_adjust_postponement_detail_quota_02.updated
+                    
                 }
             ).ToList();
 
@@ -231,10 +238,10 @@ namespace TodoAPI2.Models
             int? newkey = 0;
 
             var x = (from i in _repository.Context.eva_adjust_postponement_detail
-                    orderby i.id descending
-                    select i).Take(1).ToList();
+                     orderby i.id descending
+                     select i).Take(1).ToList();
 
-            if(x.Count > 0)
+            if (x.Count > 0)
             {
                 newkey = x[0].id + 1;
             }
@@ -250,7 +257,7 @@ namespace TodoAPI2.Models
 
 
             var inserted = _repository.Insert(entity);
- 
+
             return Get(inserted.id);
         }
 
@@ -277,44 +284,46 @@ namespace TodoAPI2.Models
                 //existingEntity.emp_level = model.emp_level;
                 //existingEntity.total_score = model.total_score;
                 //existingEntity.eva_result = model.eva_result;
-
+                existingEntity.reward_old = model.reward_old;
+                existingEntity.reward_new2 = model.reward_new2;
 
                 var updated = _repository.Update(id, existingEntity);
                 return Get(updated.id);
             }
             else
-            throw new NotificationException("No data to update");
+                throw new NotificationException("No data to update");
         }
 
 
-		public string UpdateMultiple(List<eva_adjust_postponement_detail_quota_02InputModel> model)
+        public string UpdateMultiple(List<eva_adjust_postponement_detail_quota_02InputModel> model)
         {
-            foreach(var i in model)
+            foreach (var i in model)
             {
                 if (i.active_mode == "1" && i.id.HasValue) // update
-                {                    
+                {
                     var existingEntity = _repository.Get(i.id.Value);
                     if (existingEntity != null)
                     {
-                //existingEntity.adjust_postponement_quota_id = i.adjust_postponement_quota_id;
-                //existingEntity.employee_id = i.employee_id;
-                //existingEntity.sarary = i.sarary;
-                //existingEntity.cost_living = i.cost_living;
-                //existingEntity.middle = i.middle;
-                //existingEntity.promoted_percentage = i.promoted_percentage;
-                //existingEntity.total_promote = i.total_promote;
-                //existingEntity.new_sarary = i.new_sarary;
-                //existingEntity.new_cost_living = i.new_cost_living;
-                existingEntity.remark = i.remark;
-                existingEntity.receive_quota = i.receive_quota;
-                existingEntity.new_sarary_with_quota = i.new_sarary_with_quota;
-                //existingEntity.emp_code = i.emp_code;
-                //existingEntity.emp_fullname = i.emp_fullname;
-                //existingEntity.emp_position = i.emp_position;
-                //existingEntity.emp_level = i.emp_level;
-                //existingEntity.total_score = i.total_score;
-                //existingEntity.eva_result = i.eva_result;
-
+                        //existingEntity.adjust_postponement_quota_id = i.adjust_postponement_quota_id;
+                        //existingEntity.employee_id = i.employee_id;
+                        //existingEntity.sarary = i.sarary;
+                        //existingEntity.cost_living = i.cost_living;
+                        //existingEntity.middle = i.middle;
+                        //existingEntity.promoted_percentage = i.promoted_percentage;
+                        //existingEntity.total_promote = i.total_promote;
+                        //existingEntity.new_sarary = i.new_sarary;
+                        //existingEntity.new_cost_living = i.new_cost_living;
+                        existingEntity.remark = i.remark;
+                        existingEntity.receive_quota = i.receive_quota;
+                        existingEntity.new_sarary_with_quota = i.new_sarary_with_quota;
+                        //existingEntity.emp_code = i.emp_code;
+                        //existingEntity.emp_fullname = i.emp_fullname;
+                        //existingEntity.emp_position = i.emp_position;
+                        //existingEntity.emp_level = i.emp_level;
+                        //existingEntity.total_score = i.total_score;
+                        //existingEntity.eva_result = i.eva_result;
+                        existingEntity.reward_old = i.reward_old;
+                        existingEntity.reward_new2 = i.reward_new2;
 
                         _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
                     }
@@ -326,15 +335,15 @@ namespace TodoAPI2.Models
                     _repository.InsertWithoutCommit(entity);
                 }
                 else if (i.active_mode == "0" && i.id.HasValue) // remove
-                {                    
+                {
                     _repository.DeleteWithoutCommit(i.id.Value);
                 }
                 else if (i.active_mode == "0" && !i.id.HasValue)
                 {
                     // nothing to do
-                }                
+                }
             }
-			//_repository.Context.SaveChanges();
+            //_repository.Context.SaveChanges();
 
             return model.Count().ToString();
         }
diff --git a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02ViewModel.cs b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02ViewModel.cs
index f3088d7..64bb306 100644
--- a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02ViewModel.cs
+++ b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02ViewModel.cs
@@ -60,5 +60,13 @@ namespace TodoAPI2.Models
 
         public DateTime? startDate { get; set; }
         public DateTime? endDate { get; set; }
+
+        public decimal? reward_old { get; set; }
+
+        public decimal? reward_new2 { get; set; }
+
+        public decimal? salary_max { get; set; }
+
+        public decimal? themax { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml b/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml
index fb83d78..fd602ae 100644
--- a/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml
+++ b/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml
@@ -123,11 +123,15 @@
 
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_eva_result'>ผลการประเมิน</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_sarary'>เงินเดือน ก่อนปรับเลื่อน</label></th>
+
+                <th><label id='h_eva_adjust_postponement_detail_normal_02_sarary'>ค่าตอบแทนพิเศษ ก่อนปรับเลื่อน</label></th>
+
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_cost_living'>ค่าครองชีพ ก่อนปรับเลื่อน</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_middle'>ค่ากลางฐานในการคำนวณ</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_promoted_percentage'>ร้อยละที่ได้เลื่อน</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_total_promote'>จำนวนเงินที่ได้เลื่อน</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_new_sarary'>เงินเดือนใหม่</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_normal_02_sarary'>ค่าตอบแทนพิเศษ หลังปรับเลื่อน</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_new_cost_living'>ค่าครองชีพใหม่</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_normal_02_remark'>หมายเหตุ</label></th>
             </tr>
@@ -149,9 +153,11 @@
                 <th></th>
                 <th></th>
                 <th></th>
+                <th></th>
                 <th><p id="sum_after"></p></th>
                 <th></th>
                 <th></th>
+                <th></th>
             </tr>
         </tfoot>
     </table>
diff --git a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml
index f91c6c1..6eca1b4 100644
--- a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml
+++ b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml
@@ -147,6 +147,7 @@
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_emp_level'>ระดับ</label></th>
 
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_sarary'>เงินเดือน ก่อนปรับเลื่อน</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_quota_02_reward_old'>ค่าตอบแทนพิเศษ ก่อนปรับเลื่อน</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_cost_living'>ค่าครองชีพ ก่อนปรับเลื่อน</label></th>
 
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_total_score'>คะแนนรวม</label></th>
@@ -158,10 +159,12 @@
 
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_receive_quota'>ได้รับเงินโควต้าพิเศษ</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_new_sarary_with_quota'>เงินเดือนใหม่ (รวมโควต้า)</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_quota_02_reward_new2'>ค่าตอบแทนพิเศษ หลังปรับเลื่อน</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_new_cost_living'>ค่าครองชีพใหม่</label></th>
 
                 <th><label id='h_eva_adjust_postponement_detail_quota_02_remark'>หมายเหตุ</label></th>
 
+
             </tr>
         </thead>
         <tbody class="thin-border-bottom" id="eva_adjust_postponement_detail_quota_02Body"></tbody>
diff --git a/tb320eva.csproj b/tb320eva.csproj
index e5b80b3..d0debdd 100644
--- a/tb320eva.csproj
+++ b/tb320eva.csproj
@@ -99,6 +99,7 @@
 	<None Include="wwwroot\js\eva_limit_frame_plan\eva_limit_frame_plan_inline.js" />
 	<None Include="wwwroot\js\eva_limit_frame_plan\eva_limit_frame_plan_report.js" />
 	<None Include="wwwroot\js\eva_self_review\eva_self_review.js" />
+	<None Include="wwwroot\js\rep_eva01\rep_eva01_report.js" />
 	<None Include="wwwroot\js\rep_eva_limit_frame_plan\rep_eva_limit_frame_plan_report.js" />
 	<None Include="wwwroot\js\rep_eva_self_review\rep_eva_self_review_report.js" />
 	<None Include="wwwroot\js\rep_eva_self_review_all\rep_eva_self_review_all_report.js" />
diff --git a/wwwroot/js/coregen.js b/wwwroot/js/coregen.js
index 01bb8c4..24ce77d 100644
--- a/wwwroot/js/coregen.js
+++ b/wwwroot/js/coregen.js
@@ -23,10 +23,15 @@
 //=====================================================
 
 function formatNumber(num) {
-    if(num === "" || num === null) return "";
+    if (num === "" || num === null || isNaN(num)) return "";
     return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
 }
 
+function formatNumber2(num, d) {
+    if (num === "" || num === null || isNaN(num)) return "";
+    return num.toFixed(d).replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,')
+}
+
 function formatNumberTemp(num) {
     if(num === "" || num === null) return "";
     return num.toString();
diff --git a/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js b/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js
index bb01973..58b6523 100644
--- a/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js
+++ b/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js
@@ -23,6 +23,9 @@
     $("#eva_adjust_postponement_detail_normal_02_eva_result_" + i).text("");
     $("#eva_adjust_postponement_detail_normal_02_salary_max_" + i).text("");
     $("#eva_adjust_postponement_detail_normal_02_themax_" + i).text("");
+
+    $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text("");
+    $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text("");
 }
 
 function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankItem) {
@@ -42,6 +45,7 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI
     $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(data.promoted_percentage);
     $("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(data.total_promote);
     $("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(data.new_sarary));
+
     $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(data.new_cost_living);
     $("#eva_adjust_postponement_detail_normal_02_remark_" + i).text(data.remark);
     $("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text(data.emp_code);
@@ -56,6 +60,18 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI
     $("#eva_adjust_postponement_detail_normal_02_eva_result_" + i).text(data.eva_result);
     $("#eva_adjust_postponement_detail_normal_02_salary_max_" + i).text(data.salary_max);
     $("#eva_adjust_postponement_detail_normal_02_themax_" + i).text(data.themax);
+
+    $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).val(data.reward_old);
+    $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).val(data.reward_new);
+
+    if (data.new_sarary > data.themax) {
+        $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(data.new_sarary - data.themax, 3));
+    } else {
+        $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(0, 3));
+    }
+
+    $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(data.reward_new, 3));
+    $("#themax_" + i).val(data.themax);
 }
 
 function eva_adjust_postponement_detail_normal_02_GetFromForm(obj, i) {
@@ -79,6 +95,10 @@ function eva_adjust_postponement_detail_normal_02_GetFromForm(obj, i) {
     eva_adjust_postponement_detail_normal_02Object.eva_result = obj.find("#eva_adjust_postponement_detail_normal_02_eva_result_" + i).text();
 
     eva_adjust_postponement_detail_normal_02Object.active_mode = obj.find("#isActive_" + i + "_eva_adjust_postponement_detail_normal_02").val();
+
+    eva_adjust_postponement_detail_normal_02Object.reward_old = obj.find("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text();
+    eva_adjust_postponement_detail_normal_02Object.reward_new = obj.find("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text();
+
     return eva_adjust_postponement_detail_normal_02Object;
 }
 
@@ -115,11 +135,11 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
 
             if (cur_dep !== data.emp_department_name) {
                 cur_dep = data.emp_department_name;
-                tag = "<tr><td colspan='17'><span>" + cur_dep + "</span></td></tr>";
+                tag = "<tr><td colspan='19'><span>" + cur_dep + "</span></td></tr>";
             }
 
             tag += '<tr>';
-            tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_adjust_postponement_detail_normal_02" value="1" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_normal_02_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_normal_02_adjust_postponement_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_normal_02_employee_id_' + (i + 1) + '" /></td>';
+            tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_adjust_postponement_detail_normal_02" value="1" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_normal_02_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_normal_02_adjust_postponement_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_normal_02_employee_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="themax_' + (i + 1) + '" /></td>';
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_emp_code_' + (i + 1) + '" /></td>';
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_emp_fullname_' + (i + 1) + '" /></td>';
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_emp_position_' + (i + 1) + '" /></td>';
@@ -131,11 +151,15 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
 
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_eva_result_' + (i + 1) + '" /></td>';
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_sarary_' + (i + 1) + '" /></td>';
+
+            tag += '<td><p id="eva_adjust_postponement_detail_normal_02_reward_old_' + (i + 1) + '" /></td>';
+
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_cost_living_' + (i + 1) + '" /></td>';
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_middle_' + (i + 1) + '" /></td>';
             tag += '<td><input class="form-control" onchange="Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(true)" type="number" id="eva_adjust_postponement_detail_normal_02_promoted_percentage_' + (i + 1) + '" /></td>';
             tag += '<td><input disabled class="form-control" id="eva_adjust_postponement_detail_normal_02_total_promote_' + (i + 1) + '" /></td>';
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_new_sarary_' + (i + 1) + '" /></td>';
+            tag += '<td><p id="eva_adjust_postponement_detail_normal_02_reward_new_' + (i + 1) + '" /></td>';
             tag += '<td><input disabled class="form-control" id="eva_adjust_postponement_detail_normal_02_new_cost_living_' + (i + 1) + '" /></td>';
             tag += '<td><p id="eva_adjust_postponement_detail_normal_02_remark_' + (i + 1) + '" /><p style="display:none;" id="eva_adjust_postponement_detail_normal_02_salary_max_' + (i + 1) + '" /><p style="display:none;" id="eva_adjust_postponement_detail_normal_02_themax_' + (i + 1) + '" /></td>';
             tag += '</tr>';
@@ -156,9 +180,11 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
+                tag += '<td></td>';
                 tag += '<td>' + formatNumber(data.position_allowance) + '</td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
+                tag += '<td></td>';
                 tag += '</tr>';
             }
 
@@ -178,9 +204,11 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
+                tag += '<td></td>';
                 tag += '<td>' + formatNumber(data.other_money) + '</td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
+                tag += '<td></td>';
                 tag += '</tr>';
             }
 
diff --git a/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js b/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js
index a683b17..35a6f21 100644
--- a/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js
+++ b/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js
@@ -1,5 +1,5 @@
 function eva_adjust_postponement_detail_quota_02_ClearForm(i, blankItem) {
-    var data = blankItem;
+
     $("#eva_adjust_postponement_detail_quota_02_id_" + i).val("");
     $("#eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_" + i).val("");
     $("#eva_adjust_postponement_detail_quota_02_employee_id_" + i).val("");
@@ -19,10 +19,13 @@
     $("#eva_adjust_postponement_detail_quota_02_emp_level_" + i).text("");
     $("#eva_adjust_postponement_detail_quota_02_total_score_" + i).text("");
     $("#eva_adjust_postponement_detail_quota_02_eva_result_" + i).text("");
-
+    $("#eva_adjust_postponement_detail_quota_02_reward_old_" + i).text("");
+    $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text("");
+    $("#themax_" + i).val("");
 }
 
 function eva_adjust_postponement_detail_quota_02_FeedDataToForm(data, i, blankItem) {
+
     $("#eva_adjust_postponement_detail_quota_02_id_" + i).val(data.id);
     $("#eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_" + i).val(data.adjust_postponement_quota_id);
     $("#eva_adjust_postponement_detail_quota_02_employee_id_" + i).val(data.employee_id);
@@ -43,6 +46,14 @@ function eva_adjust_postponement_detail_quota_02_FeedDataToForm(data, i, blankIt
     $("#eva_adjust_postponement_detail_quota_02_total_score_" + i).text(data.total_score);
     $("#eva_adjust_postponement_detail_quota_02_eva_result_" + i).text(data.eva_result);
 
+    if (data.new_sarary > data.themax) {
+        $("#eva_adjust_postponement_detail_quota_02_reward_old_" + i).text(formatNumber2(data.new_sarary - data.themax, 3));
+    } else {
+        $("#eva_adjust_postponement_detail_quota_02_reward_old_" + i).text(formatNumber2(0, 3));
+    }
+    
+    $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(data.reward_new2, 3));
+    $("#themax_" + i).val(data.themax);
 }
 
 function eva_adjust_postponement_detail_quota_02_GetFromForm(obj, i) {
@@ -66,6 +77,8 @@ function eva_adjust_postponement_detail_quota_02_GetFromForm(obj, i) {
     eva_adjust_postponement_detail_quota_02Object.emp_level = obj.find("#eva_adjust_postponement_detail_quota_02_emp_level_" + i).text();
     eva_adjust_postponement_detail_quota_02Object.total_score = obj.find("#eva_adjust_postponement_detail_quota_02_total_score_" + i).text();
     eva_adjust_postponement_detail_quota_02Object.eva_result = obj.find("#eva_adjust_postponement_detail_quota_02_eva_result_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.reward_old = obj.find("#eva_adjust_postponement_detail_quota_02_reward_old_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.reward_new2 = obj.find("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text();
 
     eva_adjust_postponement_detail_quota_02Object.active_mode = obj.find("#isActive_" + i + "_eva_adjust_postponement_detail_quota_02").val();
     return eva_adjust_postponement_detail_quota_02Object;
@@ -107,12 +120,12 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
 
             var tag = "";
             if (cur_dep !== data.emp_department_name) {
-                tag += '<tr><td colspan="16">' + data.emp_department_name + '</td></tr>';
+                tag += '<tr><td colspan="18">' + data.emp_department_name + '</td></tr>';
                 cur_dep = data.emp_department_name;
             }
 
             tag += '<tr>';
-            tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_adjust_postponement_detail_quota_02" value="1" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_employee_id_' + (i + 1) + '" /></td>';
+            tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_adjust_postponement_detail_quota_02" value="1" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_employee_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="themax_' + (i + 1) + '" /></td>';
 
             tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_emp_code_' + (i + 1) + '" /></td>';
             tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_emp_fullname_' + (i + 1) + '" /></td>';
@@ -120,6 +133,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
             tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_emp_level_' + (i + 1) + '" /></td>';
 
             tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_sarary_' + (i + 1) + '" /></td>';
+            tag += '<td><p id="eva_adjust_postponement_detail_quota_02_reward_old_' + (i + 1) + '" /></td>';
             tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_cost_living_' + (i + 1) + '" /></td>';
 
             tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_total_score_' + (i + 1) + '" /></td>';
@@ -131,6 +145,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
 
             tag += '<td><input onchange="CalculateRemainQuota(false);" class="form-control" type="number" id="eva_adjust_postponement_detail_quota_02_receive_quota_' + (i + 1) + '" /></td>';
             tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_' + (i + 1) + '" /></td>';
+            tag += '<td><p id="eva_adjust_postponement_detail_quota_02_reward_new2_' + (i + 1) + '" /></td>';
             tag += '<td><input class="form-control" type="number"  id="eva_adjust_postponement_detail_quota_02_new_cost_living_' + (i + 1) + '" /></td>';
             tag += '<td><p id="eva_adjust_postponement_detail_quota_02_remark_' + (i + 1) + '" /></td>';
 
@@ -152,9 +167,11 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
+                tag += '<td></td>';
                 tag += '<td>' + formatNumber(data.position_allowance) + '</td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
+                tag += '<td></td>';
                 tag += '</tr>';
             }
 
@@ -173,9 +190,11 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
+                tag += '<td></td>';
                 tag += '<td>' + formatNumber(data.other_money) + '</td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
+                tag += '<td></td>';
                 tag += '</tr>';
             }
 
diff --git a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js
index 5090d10..df927de 100644
--- a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js
+++ b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js
@@ -192,7 +192,13 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(m
                 } else {
                     $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(0);
                 }
-            }  
+            }
+
+            if (new_salary > $("#themax_" + i).val()) {
+                $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(new_salary - $("#themax_" + i).val(), 3));
+            } else {
+                $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(0, 3));
+            }
 
             sum_postpone += new_added;
             sum_before += old_salary;
diff --git a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js
index 9e049bd..4739a98 100644
--- a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js
+++ b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js
@@ -178,6 +178,12 @@ function CalculateRemainQuota(m) {
                 }
             }
 
+            if (new_sarary_with_quota > $("#themax_" + i).val()) {
+                $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(new_sarary_with_quota - $("#themax_" + i).val(), 3));
+            } else {
+                $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(0, 3));
+            }
+
             sum_receive_quota += receive_quota;
 
         }