解决名单变化 出发活动的问题

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

@@ -56,7 +56,7 @@ namespace TEAMModelOS.SDK.Models
 
         public List<string> tmdids { get; set; }
         public List<string> classes { get; set; }
-        public List<string> stuLists { get; set; }
+        public List<string> stuLists { get; set; };
         /// <summary>
         ///class行政班/teach教学班
         /// </summary>

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

@@ -84,10 +84,6 @@ namespace TEAMModelOS.SDK.Models
         public List<string> classes { get; set; }
         public List<string> stuLists { get; set; }
         /// <summary>
-        ///teach教学班
-        /// </summary>
-        public List<string> teachclasses { get; set; }
-        /// <summary>
         /// 开始时间
         /// </summary>
         public long startTime { get; set; }

TEAMModelOS.SDK/Models/Service/StuListService.cs

@@ -27,13 +27,22 @@ namespace TEAMModelFunction
                     {
                         datas.Add(item);
                     }
+                    ///还要处理该学校每个老师发布的班级的
                     List<SchoolTeacher> teachers = new List<SchoolTeacher>();
-                    await foreach (var item in client.GetContainer("TEAMModelOS", "School").GetItemQueryIterator<SchoolTeacher>(queryText: $"SELECT c.id, c.name FROM c", requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Teacher-{stuListChange.school}") }))
+                    await foreach (var item in client.GetContainer("TEAMModelOS", "School").GetItemQueryIterator<SchoolTeacher>(queryText: $"SELECT c.id, c.name FROM c",
+                        requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Teacher-{stuListChange.school}") }))
                     {
                         teachers.Add(item);
                     }
-                    var queryTech = $"SELECT distinct c.owner, c.id,c.code, c.classes,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime   FROM c  join A1 in c.classes  where c.   and   c.pk='{type}' and A1 in('{stuListChange.listid}') ";
-                    ///还要处理该学校每个老师发布的班级的
+                    foreach (var techer in teachers) {
+                        var queryTech = $"SELECT distinct c.owner, c.id,c.code, c.classes,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk ,c.endTime   FROM c " +
+                            $" join A1 in c.classes  where c.school='{stuListChange.school}'   and   c.pk='{type}' and A1 in('{stuListChange.listid}') ";
+                        await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryIterator<MQActivity>(queryText: queryTech,
+                            requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"{type}-{techer.id}") }))
+                        {
+                            datas.Add(item);
+                        }
+                    }
                 }
                 if (stuListChange.scope.Equals("private", StringComparison.OrdinalIgnoreCase)&&!string.IsNullOrEmpty(stuListChange.creatorId))
                 {