ส่ง code แก้ไข OP Change Request 18 ข้อ

Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs

@@ -114,12 +114,11 @@ namespace TodoAPI2.Models
                 join fk_external_linkage25 in ext.GetAgreeDisagree() on m_eva_create_evaluation_detail.supervisor2_result equals fk_external_linkage25.external_code
                 into external_linkageResult25
                 from fk_external_linkageResult25 in external_linkageResult25.DefaultIfEmpty()
-
-
+                
                 where 1 ==1
                 && (m_eva_create_evaluation_detail.create_evaluation_id == model.create_evaluation_id || !model.create_evaluation_id.HasValue)
                 
-                orderby m_eva_create_evaluation_detail.created descending
+                orderby fk_external_linkageResult2.department_code, fk_external_linkageResult2.position_level_id
                 select new eva_create_evaluation_detailViewModel()
                 {
                     id = m_eva_create_evaluation_detail.id,
@@ -165,6 +164,13 @@ namespace TodoAPI2.Models
                     position_level_text = fk_external_linkageResult2.position_level_text,
                     position_type_text = fk_external_linkageResult2.position_type_name,
 
+                    employee_no = fk_external_linkageResult2.employee_no,
+                    position_number = fk_external_linkageResult2.position_number,
+                    position_name = fk_external_linkageResult2.position_name,
+                    remark = null,
+
+                    department_name = fk_external_linkageResult2.department_name,
+
                     isActive = m_eva_create_evaluation_detail.isActive,
                     Created = m_eva_create_evaluation_detail.created,
                     Updated = m_eva_create_evaluation_detail.updated

Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs

@@ -89,5 +89,13 @@ namespace TodoAPI2.Models
 
         public string position_type_text { get; set; }
         public string position_level_text { get; set; }
+
+        public string employee_no { get; set; }
+
+        public string position_number { get; set; }
+
+        public string position_name { get; set; }
+        public string remark { get; set; }
+        public string department_name { get; set; }
     }
 }