แก้รายงาน และแก้บักต่างๆ
This commit is contained in:
@@ -285,7 +285,7 @@ namespace TodoAPI2.Models
|
||||
|
||||
public List<external_linkageViewModel> GetPositionForReport()
|
||||
{
|
||||
var sql = string.Format("select {0}mpn{0}.{0}position_id{0}, CONCAT(mpn.position_number,' ',pos.position_name) as position from {0}hrm_employees{0} as {0}he{0} left join {0}hrm_title_masters{0} as {0}hrm_title{0} on {0}he{0}.{0}prefix_card_name{0} = {0}hrm_title{0}.{0}id{0} left join {0}mpp_position_numbers{0} as {0}mpn{0} on {0}he{0}.{0}position{0} = {0}mpn{0}.{0}id{0} left join {0}org_position_datas{0} as {0}pos{0} on {0}mpn{0}.{0}position_id{0} = {0}pos{0}.{0}position_id{0} where {0}he{0}.{0}deleted_at{0} is null and {0}hrm_title{0}.{0}deleted_at{0} is null and {0}pos{0}.{0}deleted_at{0} is null and {0}mpn{0}.{0}deleted_at{0} is null", '"'.ToString());
|
||||
var sql = string.Format("select * from {0}org_position_datas{0} order by position_name", '"'.ToString());
|
||||
var para = db.GetParameterListNpgsql();
|
||||
DataTable dt = db.ExecuteDataTableNpgsql(sql, para);
|
||||
var result = new List<external_linkageViewModel>();
|
||||
@@ -294,7 +294,7 @@ namespace TodoAPI2.Models
|
||||
var i = new external_linkageViewModel();
|
||||
i.external_id = Convert.ToInt32(dr["position_id"]);
|
||||
i.external_code = dr["position_id"].ToString();
|
||||
i.external_name = dr["position"].ToString();
|
||||
i.external_name = dr["position_name"].ToString();
|
||||
result.Add(i);
|
||||
}
|
||||
return result;
|
||||
|
||||
Reference in New Issue
Block a user