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
2021-11-15 13:53:13 +07:00
parent 6d0a2ace7d
commit 4b98790d2e
27 changed files with 2690 additions and 50 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

@@ -140,7 +140,9 @@ namespace TodoAPI2.Models
into external_supervisor2AResult
from fk_external_supervisor2A in external_supervisor2AResult.DefaultIfEmpty()
join fk_external_supervisor3A in allemp on isNull<int?>(m_eva_create_evaluation_detail_process.supervisor3_id, fk_eva_create_evaluationResult10.supervisor3_id) equals fk_external_supervisor3A.id
into external_supervisor3AResult
from fk_external_supervisor3A in external_supervisor3AResult.DefaultIfEmpty()
where m_eva_create_evaluation_detail_process.id == id
@@ -173,6 +175,8 @@ namespace TodoAPI2.Models
supervisor1A_position = fk_external_supervisor1A.position_name,
supervisor2A_fullname = fk_external_supervisor2A.fullname,
supervisor2A_position = fk_external_supervisor2A.position_name,
supervisor3A_fullname = fk_external_supervisor3A.fullname,
supervisor3A_position = fk_external_supervisor3A.position_name,
org_id_external_linkage_external_name = fk_external_employee.department_name,
@@ -185,6 +189,7 @@ namespace TodoAPI2.Models
status_supervisor1A = m_eva_create_evaluation_detail_process.status_supervisor1A,
status_supervisor2A = m_eva_create_evaluation_detail_process.status_supervisor2A,
status_supervisor3A = m_eva_create_evaluation_detail_process.status_supervisor3A,
role_code = getRoleCode(emp_id, m_eva_create_evaluation_detail_process.chief,
m_eva_create_evaluation_detail_process.chief,
@@ -218,12 +223,14 @@ namespace TodoAPI2.Models
supervisor2_position_type_id = fk_external_supervisor2.position_type_id,
supervisor1A_position_type_id = fk_external_supervisor1A.position_type_id,
supervisor2A_position_type_id = fk_external_supervisor2A.position_type_id,
supervisor3A_position_type_id = fk_external_supervisor3A.position_type_id,
employee_position_type_id = fk_external_employee.position_type_id,
chief_position_type_id = fk_external_chief.position_type_id,
supervisor2_position_level_text = fk_external_supervisor2.position_level_text,
supervisor1A_position_level_text = fk_external_supervisor1A.position_level_text,
supervisor2A_position_level_text = fk_external_supervisor2A.position_level_text,
supervisor3A_position_level_text = fk_external_supervisor3A.position_level_text,
employee_position_level_text = fk_external_employee.position_level_text,
chief_position_level_text = fk_external_chief.position_level_text,

9
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs
View File

@@ -49,6 +49,10 @@ namespace TodoAPI2.Models
public string supervisor2A_position { get; set; }
public string supervisor3A_fullname { get; set; }
public string supervisor3A_position { get; set; }
public int? create_evaluation_id { get; set; }
public int? org_id { get; set; }
@@ -70,6 +74,8 @@ namespace TodoAPI2.Models
public string status_supervisor2A { get; set; }
public string status_supervisor3A { get; set; }
public string role_desc { get; set; }
public string role_code { get; set; }
@@ -87,11 +93,14 @@ namespace TodoAPI2.Models
public DateTime? status_supervisor1A_click_date { get; set; }
public DateTime? status_supervisor2A_click_date { get; set; }
public DateTime? status_supervisor3A_click_date { get; set; }
public string txt_status_self { get { return getStatusText(status_self) + MyHelper.GetDateStringForReport(status_self_click_date) + " " + MyHelper.GetTimeStringFromDate(status_self_click_date) + getHistoryLink(status_self); } }
public string txt_status_chief { get { return getStatusText(status_chief) + MyHelper.GetDateStringForReport(status_chief_click_date) + " " + MyHelper.GetTimeStringFromDate(status_chief_click_date) + getHistoryLink(status_chief); } }
public string txt_status_supervisor { get { return getStatusText(status_supervisor) + MyHelper.GetDateStringForReport(status_supervisor_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor_click_date) + getHistoryLink(status_supervisor); } }
public string txt_status_supervisor1A { get { return getStatusText(status_supervisor1A) + MyHelper.GetDateStringForReport(status_supervisor1A_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor1A_click_date) + getHistoryLink(status_supervisor1A); } }
public string txt_status_supervisor2A { get { return getStatusText(status_supervisor2A) + MyHelper.GetDateStringForReport(status_supervisor2A_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor2A_click_date) + getHistoryLink(status_supervisor2A); } }
public string txt_status_supervisor3A { get { return getStatusText(status_supervisor3A) + MyHelper.GetDateStringForReport(status_supervisor3A_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor3A_click_date) + getHistoryLink(status_supervisor3A); } }
private string getHistoryLink(string s)
{

2
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs
View File

@@ -29,12 +29,14 @@ namespace TodoAPI2.Models
public int? supervisor2_position_type_id { get; set; }
public int? supervisor1A_position_type_id { get; set; }
public int? supervisor2A_position_type_id { get; set; }
public int? supervisor3A_position_type_id { get; set; }
public int? employee_position_type_id { get; set; }
public int? chief_position_type_id { get; set; }
public string supervisor2_position_level_text { get; set; }
public string supervisor1A_position_level_text { get; set; }
public string supervisor2A_position_level_text { get; set; }
public string supervisor3A_position_level_text { get; set; }
public string employee_position_level_text { get; set; }
public string chief_position_level_text { get; set; }