From 24c8462932c9a1b983e16b10cff00f07a198f7ba Mon Sep 17 00:00:00 2001
From: Prathan B <prathan03@gmail.com>
Date: Sun, 12 Jul 2020 11:57:51 +0700
Subject: [PATCH] fix op 2603

---
 Models/external_linkage/external_linkageService.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Models/external_linkage/external_linkageService.cs b/Models/external_linkage/external_linkageService.cs
index b999469..b7179e9 100644
--- a/Models/external_linkage/external_linkageService.cs
+++ b/Models/external_linkage/external_linkageService.cs
@@ -276,7 +276,7 @@ namespace TodoAPI2.Models
             {
                 var i = new external_linkageViewModel();
                 i.external_id = Convert.ToInt32(dr["department_id"]);
-                i.external_code = dr["department_id"].ToString();
+                i.external_code = dr["department_id"].ToString(); 
                 i.external_name = dr["department_name"].ToString();
                 result.Add(i);
             }
@@ -356,7 +356,7 @@ namespace TodoAPI2.Models
 
         public List<external_linkageViewModel> GetEvaRound()
         {
-            var sql = string.Format("select distinct eva_performance_plan.{0}theTime{0} from eva_performance_plan order by eva_performance_plan.{0}theTime{0}", '"'.ToString());
+            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 para = db.GetParameterListNpgsql();
             DataTable dt = db.ExecuteDataTableNpgsql(sql, para);
             var result = new List<external_linkageViewModel>();
@@ -365,7 +365,7 @@ namespace TodoAPI2.Models
                 var i = new external_linkageViewModel();
                 i.external_id = Convert.ToInt32(dr["theTime"]);
                 i.external_code = dr["theTime"].ToString();
-                i.external_name = dr["theTime"].ToString();
+                i.external_name = dr["theTime"].ToString() + "/" + dr["fiscal_year"].ToString();
                 result.Add(i);
             }
             return result;