排序

2022-10-12 14:26:34 +08:00
parent f612060fd2
commit 5a4b1b04e4
2 changed files with 30 additions and 8 deletions
@@ -268,10 +268,20 @@ namespace IRaCIS.Application.Contracts
        public List<TrialCriterionReadingCategory> CriterionReadingCategoryList { get; set; }


-        public List<CriterionReadingCategory> CriterionCategoryList => CriterionReadingCategoryList.Count==0? TrialReadingCriterionList.Select(t=>new CriterionReadingCategory() { EnrollId= EnrollId ,TrialReadingCriterionId=t.TrialReadingCriterionId}).ToList():
-             CriterionReadingCategoryList
-            .GroupBy(t => new { t.TrialReadingCriterionId, t.EnrollId })
-            .Select(g => new CriterionReadingCategory() { EnrollId = g.Key.EnrollId, TrialReadingCriterionId = g.Key.TrialReadingCriterionId, ReadingCategorys = g.Select(t => t.ReadingCategory).ToList() }).ToList();
+        public List<CriterionReadingCategory> CriterionCategoryList =>
+              TrialReadingCriterionList.Select(t =>
+            new CriterionReadingCategory()
+            {
+                EnrollId = EnrollId,
+                TrialReadingCriterionId = t.TrialReadingCriterionId,
+                ReadingCategorys = CriterionReadingCategoryList.Where(c => c.TrialReadingCriterionId == t.TrialReadingCriterionId).Select(t => t.ReadingCategory).OrderBy(c => c).ToList()
+            }).ToList();
+
+
+        //CriterionReadingCategoryList.Count==0? TrialReadingCriterionList.Select(t=>new CriterionReadingCategory() { EnrollId= EnrollId ,TrialReadingCriterionId=t.TrialReadingCriterionId}).ToList():
+        // CriterionReadingCategoryList
+        //.GroupBy(t => new { t.TrialReadingCriterionId, t.EnrollId })
+        //.Select(g => new CriterionReadingCategory() { EnrollId = g.Key.EnrollId, TrialReadingCriterionId = g.Key.TrialReadingCriterionId, ReadingCategorys = g.Select(t => t.ReadingCategory).OrderBy(t=>t).ToList() }).ToList();


    }