diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs index 18607d3..5712646 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs @@ -310,7 +310,9 @@ namespace TodoAPI2.Models //fk_external_employee.department_code, fk_external_employee.hpt_position_type_id, fk_external_employee.hpl_position_level_id, - fk_external_employee.employee_no + fk_external_employee.employee_no, + fk_planResult.fiscal_year descending, + fk_planResult.theTime descending select new eva_create_evaluation_detail_processViewModel() { id = m_eva_create_evaluation_detail_process.id, diff --git a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs index 2476528..029ee07 100644 --- a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs +++ b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs @@ -203,7 +203,7 @@ namespace TodoAPI2.Models existingEntity.total_salary = model.total_salary; existingEntity.total_salary_limit = model.total_salary_limit; existingEntity.total_salary_limit_rounded = model.total_salary_limit_rounded; - existingEntity.remark = model.remark; + existingEntity.remark = ""; int j = 1; foreach (var y in from z in _repository.Context.eva_limit_frame_employee where z.frame_group_guid == model.id orderby z.order_of_data select z) diff --git a/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml b/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml index 237b7b2..5362385 100644 --- a/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml +++ b/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml @@ -152,7 +152,7 @@
- +
diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js index 794456c..5668881 100644 --- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js +++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js @@ -179,6 +179,7 @@ var eva_create_evaluation_detail_processTableV; var eva_create_evaluation_detail_process_setupTable = function (result) { var groupColumn = 6; + console.log(result); tmp = '"'; eva_create_evaluation_detail_processTableV = $('#eva_create_evaluation_detail_processTable').DataTable({