- ประเมิน : เรียงลำดับ

- ประเมิน : บันทึกแล้วเลขซ้ำ

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,

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)

Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml

@@ -152,7 +152,7 @@
                     <div class='row'>
                         <div class="form-group col-md-12">
                             <label id="lab_eva_limit_frame_group_remark" for="eva_limit_frame_group_remark">หมายเหตุ</label>
-                            <textarea class="form-control" rows="4" cols="50" id="eva_limit_frame_group_remark" iLabel="หมายเหตุ" iRequire="false" iGroup="eva_limit_frame_group"></textarea>
+                            <textarea disabled class="form-control" rows="4" cols="50" id="eva_limit_frame_group_remark" iLabel="หมายเหตุ" iRequire="false" iGroup="eva_limit_frame_group"></textarea>
                         </div>
                     </div>
 

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({