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

แก้ไข OP 3243, 3244

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-08-23 20:58:06 +07:00
parent 4f47414d1b
commit 5309806df0
12 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementService.cs
View File

@@ -183,6 +183,10 @@ namespace TodoAPI2.Models
into eva_create_evaluationResult10
from fk_eva_create_evaluationResult10 in eva_create_evaluationResult10.DefaultIfEmpty()
join fk_plan in _repository.Context.eva_performance_plan on fk_eva_create_evaluationResult10.performance_plan_id equals fk_plan.id
into planResult
from fk_planResult in planResult.DefaultIfEmpty()
where 1==1
&& (m_eva_create_evaluation_detail_agreement.create_evaluation_id == model.create_evaluation_id || !model.create_evaluation_id.HasValue)
&& (fk_external_employee.department_id == model.org_id || !model.org_id.HasValue)
@@ -217,6 +221,8 @@ namespace TodoAPI2.Models
status_chief_click_date = m_eva_create_evaluation_detail_agreement.status_chief_click_date,
status_supervisor_click_date = m_eva_create_evaluation_detail_agreement.status_supervisor_click_date,
plan_round_year = checkNull(fk_planResult.theTime) + "/" + checkNull(fk_planResult.fiscal_year),
isActive = m_eva_create_evaluation_detail_agreement.isActive,
Created = m_eva_create_evaluation_detail_agreement.created,
Updated = m_eva_create_evaluation_detail_agreement.updated
@@ -226,6 +232,15 @@ namespace TodoAPI2.Models
return data;
}
private string checkNull(object i)
{
if (i != null)
{
return i.ToString();
}
return "";
}
#endregion

2
Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementViewModel.cs
View File

@@ -50,6 +50,8 @@ namespace TodoAPI2.Models
public string remark_hrm_work_record { get; set; }
public string plan_round_year { get; set; }
public DateTime? status_self_click_date { get; set; }
public DateTime? status_chief_click_date { get; set; }
public DateTime? status_supervisor_click_date { get; set; }