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

16
Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs
View File

@@ -137,6 +137,8 @@ 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 decimal? total_summary_supervisor1A { get; set; }
public decimal? Final_summary_supervisor1A { get; set; }
@@ -198,6 +200,20 @@ namespace TodoAPI2.Models
[MaxLength(1000)]
public string remark { get; set; }
public int? supervisor3_id { get; set; }
public int? supervisor3A { get; set; }
[MaxLength(1)]
public string supervisor3A_result { get; set; }
[MaxLength(1000)]
public string supervisor3A_remark { get; set; }
public DateTime? supervisor3A_date { get; set; }
[MaxLength(1)]
public string status_supervisor3A { get; set; }
}
}

2
Models/eva_create_evaluation_detail/eva_create_evaluation_detailInputModel.cs
View File

@@ -36,6 +36,8 @@ namespace TodoAPI2.Models
public string remark { get; set; }
public int? supervisor3_id { get; set; }
public string active_mode { get; set; }
}
}

8
Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
View File

@@ -82,6 +82,7 @@ namespace TodoAPI2.Models
i.item_eva_employee_id = i.item_employee_id;
i.item_supervisor1_id = i.item_employee_id;
i.item_supervisor2_id = i.item_employee_id;
i.item_supervisor3_id = i.item_employee_id;
i.item_help_org_id = ext.GetDepartmentData();
return i;
@@ -95,6 +96,7 @@ namespace TodoAPI2.Models
i.item_eva_employee_id = i.item_employee_id;
i.item_supervisor1_id = i.item_employee_id;
i.item_supervisor2_id = i.item_employee_id;
i.item_supervisor3_id = i.item_employee_id;
i.item_help_org_id = ext.GetDepartmentData();
return i;
@@ -139,6 +141,10 @@ namespace TodoAPI2.Models
into external_linkageResult46
from fk_external_linkageResult46 in external_linkageResult46.DefaultIfEmpty()
join fk_external_linkage48 in allemp on m_eva_create_evaluation_detail.supervisor3_id equals fk_external_linkage48.id
into external_linkageResult48
from fk_external_linkageResult48 in external_linkageResult48.DefaultIfEmpty()
join fk_external_linkage99 in ext.GetDepartmentData() on (m_eva_create_evaluation_detail.help_org_id.HasValue ? m_eva_create_evaluation_detail.help_org_id : fk_external_linkageResult2.department_id) equals fk_external_linkage99.id
into external_linkageResult99
from fk_external_linkageResult99 in external_linkageResult99.DefaultIfEmpty()
@@ -197,6 +203,7 @@ namespace TodoAPI2.Models
status_supervisor1A = m_eva_create_evaluation_detail.status_supervisor1A,
status_supervisor2A = m_eva_create_evaluation_detail.status_supervisor2A,
status_supervisor3A = m_eva_create_evaluation_detail.status_supervisor3A,
employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname,
chief_external_linkage_external_name = fk_external_linkageResult3.fullname,
@@ -216,6 +223,7 @@ namespace TodoAPI2.Models
status_supervisor_click_date = m_eva_create_evaluation_detail.status_supervisor_click_date,
status_supervisor1A_click_date = m_eva_create_evaluation_detail.status_supervisor1A_click_date,
status_supervisor2A_click_date = m_eva_create_evaluation_detail.status_supervisor2A_click_date,
status_supervisor3A_click_date = m_eva_create_evaluation_detail.status_supervisor3A_click_date,
department_name = fk_external_linkageResult99.external_name,
help_org_id_external_linkage_external_name = fk_external_linkageResult46.external_name,

7
Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs
View File

@@ -82,10 +82,13 @@ namespace TodoAPI2.Models
public string status_supervisor2A { get; set; }
public string status_supervisor3A { 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; }
public string supervisor2_result_external_linkage_external_name { get; set; }
public string supervisor3_result_external_linkage_external_name { get; set; }
public string position_type_text { get; set; }
public string position_level_text { get; set; }
@@ -103,6 +106,7 @@ namespace TodoAPI2.Models
public DateTime? status_supervisor_click_date { get; set; }
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 int? eva_employee_id { get; set; }
@@ -110,6 +114,8 @@ namespace TodoAPI2.Models
public int? supervisor2_id { get; set; }
public int? supervisor3_id { get; set; }
public decimal? work_period { get; set; }
public int? order_of_data { get; set; }
@@ -120,6 +126,7 @@ namespace TodoAPI2.Models
public string txt_status_supervisor { get { return getStatusText(status_supervisor) + MyHelper.GetDateStringForReport(status_supervisor_click_date); } }
public string txt_status_supervisor1A { get { return getStatusText(status_supervisor1A) + MyHelper.GetDateStringForReport(status_supervisor1A_click_date); } }
public string txt_status_supervisor2A { get { return getStatusText(status_supervisor2A) + MyHelper.GetDateStringForReport(status_supervisor2A_click_date); } }
public string txt_status_supervisor3A { get { return getStatusText(status_supervisor3A) + MyHelper.GetDateStringForReport(status_supervisor3A_click_date); } }
public string help_org_id_external_linkage_external_name { get; set; }

1
Models/eva_create_evaluation_detail/eva_create_evaluation_detailWithSelectionViewModel.cs
View File

@@ -13,6 +13,7 @@ namespace TodoAPI2.Models
public List<external_employeeViewModel> item_eva_employee_id { get; set; }
public List<external_employeeViewModel> item_supervisor1_id { get; set; }
public List<external_employeeViewModel> item_supervisor2_id { get; set; }
public List<external_employeeViewModel> item_supervisor3_id { get; set; }
public List<external_linkageViewModel> item_help_org_id { get; set; }
}
}