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

ปรับปรุงหลายอย่าง

Browse Source
This commit is contained in:
nakorn
2022-03-19 11:32:56 +07:00
parent 61f067f150
commit c6d107e179
11 changed files with 2588 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
View File

@@ -384,6 +384,13 @@ namespace TodoAPI2.Models
return GetListBySearch(model, emp_id, path);
}
private string GetOnlyDep(string input)
{
var i = input.Split('-');
if (i.Length == 2) return i[1].Trim();
return input;
}
public List<eva_create_evaluation_detail_processViewModel> GetListBySearch(eva_create_evaluation_detail_processSearchModel model, int? emp_id, string path)
{
object special_person = (from x in _repository.Context.eva_setup_permission
@@ -474,7 +481,7 @@ namespace TodoAPI2.Models
search_employee_code = fk_external_employee.employee_no,
search_employee_fullname = fk_external_employee.fullname,
org_id_external_linkage_external_name = !string.IsNullOrEmpty(fk_external_linkageResult11.external_name) ? fk_external_linkageResult11.external_name : fk_external_employee.department_name,
org_id_external_linkage_external_name = !string.IsNullOrEmpty(fk_external_linkageResult11.external_name) ? GetOnlyDep(fk_external_linkageResult11.external_name) : fk_external_employee.department_name,
status_self = m_eva_create_evaluation_detail_process.status_self,
status_chief = m_eva_create_evaluation_detail_process.status_chief,

8
Models/eva_evaluation_achievement/eva_evaluation_achievementService.cs
View File

@@ -232,10 +232,10 @@ namespace TodoAPI2.Models
where i.id == model.create_evaluation_detail_id
select i).FirstOrDefault();
if (current_detail.status_self == "Y")
{
throw new Exception("คุณนำส่งข้อตกลงการประเมินไปแล้ว ไม่สามารถบันทึกได้");
}
//if (current_detail.status_self == "Y")
//{
// throw new Exception("คุณนำส่งข้อตกลงการประเมินไปแล้ว ไม่สามารถบันทึกได้");
//}
var existingEntity = _repository.Get(id);
if (existingEntity != null)