thamming_dev01/hrm_eva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix op 2603

Browse Source
This commit is contained in:
Prathan B
2020-07-12 11:57:51 +07:00
parent 5d81ed8b81
commit 24c8462932
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Models/external_linkage/external_linkageService.cs
View File

@@ -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;