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

Change Request/Feature OP เลขที่ 3217, 3200, 3216, 3219 ดำเนินการแล้ว

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-08-20 21:11:56 +07:00
parent c2b65272e6
commit 72ac6d9cc9
13 changed files with 170 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processInputModel.cs
View File

@@ -42,6 +42,8 @@ namespace TodoAPI2.Models
public string search_employee_fullname { get; set; }
public int? employee_id { get; set; }
public string active_mode { get; set; }
}
}

4
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processSearchModel.cs
View File

@@ -21,7 +21,9 @@ namespace TodoAPI2.Models
public string search_employee_code { get; set; }
public string search_employee_fullname { get; set; }
public int? employee_id { get; set; }
public string path { get; set; }
}
}

5
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
View File

@@ -170,13 +170,15 @@ namespace TodoAPI2.Models
item.item_level_score = (from i in _repository.Context.eva_level_score
orderby i.min_score
select Mapper.Map<eva_level_scoreViewModel>(i)).ToList();
item.item_employee_id = (from x in emp.GetListByemployee_type(null,null) select x).ToList();
return item;
}
public eva_create_evaluation_detail_processWithSelectionViewModel GetBlankItem()
{
var i = new eva_create_evaluation_detail_processWithSelectionViewModel();
i.item_org_id = ext.GetDepartmentData();
i.item_employee_id = (from x in emp.GetListByemployee_type(null, null) select x).ToList();
//i.item_level_score = (from j in _repository.Context.eva_level_score
// orderby j.min_score
// select Mapper.Map<eva_level_scoreViewModel>(i)).ToList();
@@ -240,6 +242,7 @@ namespace TodoAPI2.Models
|| (fk_eva_create_evaluationResult10.supervisor1_id.HasValue && emp_id == fk_eva_create_evaluationResult10.supervisor1_id)
|| (fk_eva_create_evaluationResult10.supervisor2_id.HasValue && emp_id == fk_eva_create_evaluationResult10.supervisor2_id)
)
&& (!model.employee_id.HasValue || m_eva_create_evaluation_detail_process.employee_id == model.employee_id)
orderby
fk_sort_depResult2.external_code,

2
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs
View File

@@ -11,6 +11,8 @@ namespace TodoAPI2.Models
public List<eva_level_scoreViewModel> item_level_score { get; set; }
public List<external_employeeViewModel> item_employee_id { get; set; }
public decimal? create_evaluation_score1 { get; set; }
public decimal? create_evaluation_score2 { get; set; }