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 Rientrakrunchai
2020-03-13 07:07:20 +07:00
parent 4dc669342f
commit c334d7a9dd
16 changed files with 682 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs
View File

@@ -104,5 +104,11 @@ namespace TodoAPI2.Models
public string supervisor2A_remark { get; set; }
public DateTime? supervisor2A_date { get; set; }
[MaxLength(1)]
public string status_supervisor1A { get; set; }
[MaxLength(1)]
public string status_supervisor2A { get; set; }
}
}

3
Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
View File

@@ -154,6 +154,9 @@ namespace TodoAPI2.Models
status_chief = m_eva_create_evaluation_detail.status_chief,
status_supervisor = m_eva_create_evaluation_detail.status_supervisor,
status_supervisor1A = m_eva_create_evaluation_detail.status_supervisor1A,
status_supervisor2A = m_eva_create_evaluation_detail.status_supervisor2A,
employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname,
chief_external_linkage_external_name = fk_external_linkageResult3.fullname,
supervisor1_result_external_linkage_external_name = fk_external_linkageResult21.external_name,

4
Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs
View File

@@ -78,6 +78,10 @@ namespace TodoAPI2.Models
public string status_supervisor { get; set; }
public string status_supervisor1A { get; set; }
public string status_supervisor2A { get; set; }
public string employee_id_external_linkage_external_name { get; set; }
public string chief_external_linkage_external_name { get; set; }
public string supervisor1_result_external_linkage_external_name { get; set; }

4
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
View File

@@ -85,8 +85,8 @@ namespace TodoAPI2.Models
employee_code = fk_external_employee.employee_no,
employee_fullname = fk_external_employee.fullname,
employee_position = fk_external_employee.position_name,
employee_position_type = null,
employee_position_level = null,
employee_position_type = fk_external_employee.employee_type_name,
employee_position_level = fk_external_employee.position_level_text,
employee_org = fk_external_employee.department_name,
chief_fullname = fk_external_chief.fullname,
chief_position = fk_external_chief.position_name,