เพิ่มฟิลเพื่อรองรับการจัดข้อมูลเก่า

Models/eva_adjust_postponement/eva_adjust_postponementEntity.cs

@@ -54,6 +54,9 @@ namespace TodoAPI2.Models
             }
         }
 
+        [MaxLength(1000)]
+        public string report_type { get; set; }
+
         public DateTime? imported_date { get; set; }
     }
 }

Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs

@@ -63,5 +63,7 @@ namespace TodoAPI2.Models
         public string migration_eva_result { get; set; }
 
         public int? org_at_this_time { get; set; }
+
+        public int? order_at_this_time { get; set; }
     }
 }

Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationInputModel.cs

@@ -56,6 +56,8 @@ namespace TodoAPI2.Models
 
         public int? org_at_this_time { get; set; }
 
+        public int? order_at_this_time { get; set; }
+
         public string active_mode { get; set; }
 
     }

Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationViewModel.cs

@@ -53,6 +53,8 @@ namespace TodoAPI2.Models
         public string migration_eva_result { get; set; }
         public int? org_at_this_time { get; set; }
 
+        public int? order_at_this_time { get; set; }
+
         public int? adjust_postponement_id_eva_adjust_postponement_fiscal_year { get; set; }
         public int? adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year { get; set; }
         public string employee_id_external_linkage_external_name { get; set; }

Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationInputModel.cs

@@ -40,6 +40,8 @@ namespace TodoAPI2.Models
 
         public string imported_file { get; set; }
 
+        public string report_type { get; set; }
+
         public string active_mode { get; set; }
     }
 }

Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationService.cs

@@ -85,7 +85,7 @@ namespace TodoAPI2.Models
             i.item_create_evaluation_id = (from x in _repository.Context.eva_create_evaluation select x).ToList();
             var all_emp = emp.GetAllEmployee();
             i.item_managed_by = all_emp.ToList();
-
+            i.item_report_type = (from x in ext.GetSalaryReportType() select x).ToList();
 
             return i;
         }
@@ -95,7 +95,7 @@ namespace TodoAPI2.Models
             i.item_create_evaluation_id = (from x in _repository.Context.eva_create_evaluation select x).ToList();
             var all_emp = emp.GetAllEmployee();
             i.item_managed_by = all_emp.ToList();
-
+            i.item_report_type = (from x in ext.GetSalaryReportType() select x).ToList();
 
             return i;
         }
@@ -144,6 +144,7 @@ namespace TodoAPI2.Models
                     managed_by = m_eva_adjust_postponement_migration.managed_by,
                     imported_file = m_eva_adjust_postponement_migration.imported_file,
                     imported_fileDisplay = m_eva_adjust_postponement_migration.imported_fileDisplay,
+                    report_type = m_eva_adjust_postponement_migration.report_type,
 
                     create_evaluation_id_eva_create_evaluation_performance_plan_id = fk_eva_create_evaluationResult4.performance_plan_id,
                     managed_by_external_linkage_external_name = fk_external_linkageResult11.fullname,

Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationViewModel.cs

@@ -53,5 +53,7 @@ namespace TodoAPI2.Models
         public Guid? create_evaluation_id_eva_create_evaluation_performance_plan_id { get; set; }
         public string managed_by_external_linkage_external_name { get; set; }
 
+        public string report_type { get; set; }
+
     }
 }

Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationWithSelectionViewModel.cs

@@ -9,6 +9,7 @@ namespace TodoAPI2.Models
     {
         public List<eva_create_evaluationEntity> item_create_evaluation_id { get; set; }
         public List<external_employeeViewModel> item_managed_by { get; set; }
-
+        public List<external_linkageViewModel> item_report_type { get; set; }
     }
-}
+}
+

Models/external_linkage/Iexternal_linkageService.cs

@@ -36,6 +36,8 @@ namespace TodoAPI2.Models
         List<external_linkageViewModel> GetFiscalYear2();
         List<external_linkageViewModel> GetThaiMonth();
         string GetMainDept(int? dep_id);
+
+        List<external_linkageViewModel> GetSalaryReportType();
     }
 }
 

Models/external_linkage/external_linkageService.cs

@@ -113,6 +113,24 @@ namespace TodoAPI2.Models
             return result;
         }
 
+        public List<external_linkageViewModel> GetSalaryReportType()
+        {
+            var result = new List<external_linkageViewModel>();
+            var i = new external_linkageViewModel();
+            i.external_id = 1;
+            i.external_code = "1";
+            i.external_name = "รายงานเพื่อดูย้อนหลัง";
+            result.Add(i);
+
+            var j = new external_linkageViewModel();
+            j.external_id = 2;
+            j.external_code = "2";
+            j.external_name = "รายงานปกติ";
+            result.Add(j);
+
+            return result;
+        }
+
         public List<external_linkageViewModel> GetChoice(int start, int end)
         {
             var result = new List<external_linkageViewModel>();