Fix Data

Models/external_linkage/external_linkageService.cs

@@ -356,7 +356,7 @@ namespace TodoAPI2.Models
 
         public List<external_linkageViewModel> GetEvaRound()
         {
-            var sql = string.Format("select distinct eva_performance_plan.{0}theTime{0} , eva_performance_plan.fiscal_year from eva_performance_plan order by eva_performance_plan.{0}theTime{0}", '"'.ToString());
+            var sql = string.Format("select distinct eva_performance_plan.id,eva_performance_plan.{0}theTime{0} , eva_performance_plan.fiscal_year from eva_performance_plan order by eva_performance_plan.fiscal_year,eva_performance_plan.{0}theTime{0}", '"'.ToString());
             var para = db.GetParameterListNpgsql();
             DataTable dt = db.ExecuteDataTableNpgsql(sql, para);
             var result = new List<external_linkageViewModel>();
@@ -364,6 +364,7 @@ namespace TodoAPI2.Models
             {
                 var i = new external_linkageViewModel();
                 i.external_id = Convert.ToInt32(dr["theTime"]);
+                i.id_guid = Guid.Parse(dr["id"].ToString());
                 i.external_code = dr["theTime"].ToString();
                 i.external_name = dr["theTime"].ToString() + "/" + dr["fiscal_year"].ToString();
                 result.Add(i);

Models/external_linkage/external_linkageViewModel.cs

@@ -14,6 +14,7 @@ namespace TodoAPI2.Models
     public class external_linkageViewModel 
     {
 
+        public Guid? id_guid { get; set; }
         public int? external_id { get; set; }
 
         public string external_code { get; set; }

Models/rep_eva01/rep_eva01SearchModel.cs

@@ -16,8 +16,8 @@ namespace TodoAPI2.Models
 
         public string org_id { get; set; }
 
-        public int? round_id { get; set; }
-
+        public Guid? round_id { get; set; }
+        public string round_text { get; set; }
     }
 }
 

Models/rep_eva01/rep_eva01Service.cs

@@ -58,7 +58,7 @@ namespace TodoAPI2.Models
             var entity = _repository.Get(id);
             var i = Mapper.Map<rep_eva01WithSelectionViewModel>(entity);
             i.item_org_id = (from x in ext.GetDepartmentDataForReport() select x).ToList();
-            i.item_round_id = (from x in ext.GetYesNo() select x).ToList();
+            i.item_round_id = (from x in ext.GetEvaRound() select x).ToList();
 
 
             return i;

Models/rep_eva02/rep_eva02SearchModel.cs

@@ -16,7 +16,8 @@ namespace TodoAPI2.Models
 
         public int? org_id { get; set; }
 
-        public int? round_id { get; set; }
+        public Guid? round_id { get; set; }
+        public string round_text { get; set; }
 
     }
 }