Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS.SDK/Models/Cosmos/Common/ArtMusic.cs

@@ -13,8 +13,10 @@ namespace TEAMModelOS.SDK.Models.Cosmos.Common
         {
             pk = "ArtMusic";
         }
+        //模块ID
         public string activityId { get; set; }
         public List<StuInfo> stus { get; set; }
+        //第三方平台返回的结构
         public JsonElement JsonElement { get; set; }
     }
     public class StuInfo {

TEAMModelOS/Controllers/Analysis/ClassAnalysisController.cs

@@ -136,31 +136,31 @@ namespace TEAMModelOS.Controllers.Analysis
                     {
                         x.Key,
                         name = perMore[x.Key],
-                        count = x.Sum(t => t.learningCategory.interaction)
+                        count = x.Sum(t => t.learningCategory?.interaction)
                     });
                     var cooperation = records.Where(c => c.startTime >= stime.GetInt64() && c.startTime <= etime.GetInt64() && c.grade.Any()).GroupBy(k => int.Parse(k.grade?[0])).Select(x => new
                     {
                         x.Key,
                         name = perMore[x.Key],
-                        count = x.Sum(t => t.learningCategory.cooperation)
+                        count = x.Sum(t => t.learningCategory?.cooperation)
                     });
                     var task = records.Where(c => c.startTime >= stime.GetInt64() && c.startTime <= etime.GetInt64() && c.grade.Any()).GroupBy(k => int.Parse(k.grade?[0])).Select(x => new
                     {
                         x.Key,
                         name = perMore[x.Key],
-                        count = x.Sum(t => t.learningCategory.task)
+                        count = x.Sum(t => t.learningCategory?.task)
                     });
                     var exam = records.Where(c => c.startTime >= stime.GetInt64() && c.startTime <= etime.GetInt64() && c.grade.Any()).GroupBy(k => int.Parse(k.grade?[0])).Select(x => new
                     {
                         x.Key,
                         name = perMore[x.Key],
-                        count = x.Sum(t => t.learningCategory.exam)
+                        count = x.Sum(t => t.learningCategory?.exam)
                     });
                     var diffential = records.Where(c => c.startTime >= stime.GetInt64() && c.startTime <= etime.GetInt64() && c.grade.Any()).GroupBy(k => int.Parse(k.grade?[0])).Select(x => new
                     {
                         x.Key,
                         name = perMore[x.Key],
-                        count = x.Sum(t => t.learningCategory.diffential)
+                        count = x.Sum(t => t.learningCategory?.diffential)
                     });
                     List<(string name, int? cICount, int? pCount, int? cTCount, int? eCount,int? diffCount)> tcount = new();
                     List<(string name, int? count)> gdCount = new();