ปรับปรุงหลายข้อ

Models/eva_salary_cylinder/eva_salary_cylinderService.cs

@@ -95,7 +95,7 @@ namespace TodoAPI2.Models
 
                 where m_eva_salary_cylinder.position_type == position_type || !position_type.HasValue
 
-                orderby m_eva_salary_cylinder.created descending
+                orderby fk_external_linkageResult1.external_code, fk_external_linkageResult2.external_code
                 select new eva_salary_cylinderViewModel()
                 {
                     id = m_eva_salary_cylinder.id,
@@ -139,7 +139,7 @@ namespace TodoAPI2.Models
                 && (m_eva_salary_cylinder.position_type == model.position_type || !model.position_type.HasValue)
 
 
-                orderby m_eva_salary_cylinder.created descending
+                orderby fk_external_linkageResult1.external_code, fk_external_linkageResult2.external_code
                 select new eva_salary_cylinderViewModel()
                 {
                     id = m_eva_salary_cylinder.id,

Models/rep_eva02/Irep_eva02Service.cs

@@ -16,7 +16,7 @@ namespace TodoAPI2.Models
         rep_eva02WithSelectionViewModel GetWithSelection(Guid id);
 		rep_eva02WithSelectionViewModel GetBlankItem();
 
-
+        void SetEvaDate(rep_eva02ReportRequestModel model);
 
     }
 }

Models/rep_eva02/rep_eva02SearchModel.cs

@@ -18,7 +18,7 @@ namespace TodoAPI2.Models
 
         public int? round_id { get; set; }
         public string round_text { get; set; }
-
+        public string eva_date { get; set; }
     }
 }
 

Models/rep_eva02/rep_eva02Service.cs

@@ -73,6 +73,13 @@ namespace TodoAPI2.Models
             return i;
         }
 
+        public void SetEvaDate(rep_eva02ReportRequestModel model)
+        {
+            model.eva_date = (from i in _repository.Context.eva_adjust_postponement
+                     where i.id == model.round_id
+                     select MyHelper.GetDateStringForReport(i.theDate)).FirstOrDefault();
+        }
+
         #endregion
 
         #endregion