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

ส่ง code แก้ไข OP Change Request 18 ข้อ

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-05-24 00:33:22 +07:00
parent 017a29c136
commit eea05beb69
81 changed files with 1047 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Models/eva_evaluation_group_detail/eva_evaluation_group_detailService.cs
View File

@@ -92,37 +92,10 @@ namespace TodoAPI2.Models
public List<eva_evaluation_group_detailViewModel> GetListByevaluation_group_id(Guid? evaluation_group_id)
{
var data = (
from m_eva_evaluation_group_detail in _repository.Context.eva_evaluation_group_detail
eva_evaluation_group_detailSearchModel model = new eva_evaluation_group_detailSearchModel();
model.evaluation_group_id = evaluation_group_id;
join fk_eva_evaluation_group1 in _repository.Context.eva_evaluation_group on m_eva_evaluation_group_detail.evaluation_group_id equals fk_eva_evaluation_group1.id
into eva_evaluation_groupResult1
from fk_eva_evaluation_groupResult1 in eva_evaluation_groupResult1.DefaultIfEmpty()
join fk_external_employee in external_employee.GetListByemployee_type(null, null) on m_eva_evaluation_group_detail.employee_id equals fk_external_employee.id
into external_employeeResult
from fk_external_employeeResult in external_employeeResult.DefaultIfEmpty()
where m_eva_evaluation_group_detail.evaluation_group_id == evaluation_group_id || !evaluation_group_id.HasValue
orderby m_eva_evaluation_group_detail.created descending
select new eva_evaluation_group_detailViewModel()
{
id = m_eva_evaluation_group_detail.id,
evaluation_group_id = m_eva_evaluation_group_detail.evaluation_group_id,
employee_id = m_eva_evaluation_group_detail.employee_id,
evaluation_group_id_eva_evaluation_group_code = fk_eva_evaluation_groupResult1.code,
position_number = fk_external_employeeResult.position_number,
position_name = fk_external_employeeResult.position_name,
fullname = fk_external_employeeResult.fullname,
isActive = m_eva_evaluation_group_detail.isActive,
Created = m_eva_evaluation_group_detail.created,
Updated = m_eva_evaluation_group_detail.updated
}
).ToList();
var data = GetListBySearch(model);
return data;
}
@@ -143,8 +116,11 @@ namespace TodoAPI2.Models
where 1==1
&& (m_eva_evaluation_group_detail.evaluation_group_id == model.evaluation_group_id || !model.evaluation_group_id.HasValue)
orderby m_eva_evaluation_group_detail.created descending
orderby
fk_external_employeeResult.department_degree_id,
fk_external_employeeResult.department_code,
fk_external_employeeResult.position_level_id,
fk_external_employeeResult.employee_no
select new eva_evaluation_group_detailViewModel()
{
id = m_eva_evaluation_group_detail.id,
@@ -157,6 +133,10 @@ namespace TodoAPI2.Models
position_name = fk_external_employeeResult.position_name,
fullname = fk_external_employeeResult.fullname,
department_name = fk_external_employeeResult.department_name,
position_level_text = fk_external_employeeResult.position_level_text,
employee_no = fk_external_employeeResult.employee_no,
isActive = m_eva_evaluation_group_detail.isActive,
Created = m_eva_evaluation_group_detail.created,
Updated = m_eva_evaluation_group_detail.updated

6
Models/eva_evaluation_group_detail/eva_evaluation_group_detailViewModel.cs
View File

@@ -26,5 +26,9 @@ namespace TodoAPI2.Models
public string fullname { get; set; }
public string department_name { get; set; }
public string position_level_text { get; set; }
public string employee_no { get; set; }
}
}
}