CrazyIter_Bin 1 year ago
parent
commit
6c159a0c9c

+ 15 - 2
TEAMModelOS.SDK/Models/Service/LessonService.cs

@@ -238,7 +238,14 @@ namespace TEAMModelOS.SDK.Models.Service
                 List<int > buzzClients= new List<int>();
                 if (iRSDatas.IsNotEmpty()) {
                     interactCount= iRSDatas.Where(z => z.isBuzz==false).Select(v => v.clientAnswers).Select(z=>z.Keys).Count();
-                    iRSDatas.Where(z => z.buzzClients.IsNotEmpty()).SelectMany(v => v.buzzClients);
+                    var bclients = iRSDatas.Where(z => z.buzzClients.IsNotEmpty()).SelectMany(v => v.buzzClients);
+                    if (bclients!=null && bclients.Count()>0) {
+                        foreach (var bc in bclients) {
+                            if (int.TryParse(bc, out int b)) {
+                                buzzClients.Add(b);
+                            }
+                        }
+                    }
                 }
                 //任务发布次数 ,-1 表示没有进行互动。 与 0 不同
                 int taskCount = -1;
@@ -290,6 +297,7 @@ namespace TEAMModelOS.SDK.Models.Service
                     ClientSummaryList clientSummaryList = lessonBase.report.clientSummaryList.Find(c => c.seatID == x.seatID);
                     int stuInteractCount = -1;
                     int stuInteractJoin = 0;
+                    //获取挑人的互动
                     var ids=  pickupMemberIds.FindAll(z => z==x.seatID);
                     if (ids.IsNotEmpty())
                     {
@@ -304,7 +312,12 @@ namespace TEAMModelOS.SDK.Models.Service
 
                         }
                     }
-                   
+                    //获取抢权的互动
+                    var buzIds = buzzClients.FindAll(z => z==x.seatID);
+                    if (buzIds.IsNotEmpty()) {
+                        stuInteractJoin=stuInteractJoin+buzIds.Count;
+
+                    }
                     if (record != null)
                     {
                         if (clientSummaryList != null)

+ 1 - 1
TEAMModelOS/Controllers/Student/OverallEducationController.cs

@@ -113,7 +113,7 @@ namespace TEAMModelOS.Controllers
                 List<Student> grade_students = new List<Student>();
                 List<OverallEducation> grade_overallEducations = new List<OverallEducation>();
                 List<OverallEducation> overallEducations = new List<OverallEducation>();
-                HashSet<string> classIds = null;
+                HashSet<string> classIds = new HashSet<string>();
 
                 var client = _azureCosmos.GetCosmosClient();
                 School school = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>($"{_school}", new PartitionKey("Base"));