投票，问卷发布对象调整

TEAMModelFunction/ActivityHttpTrigger.cs

@@ -140,8 +140,8 @@ namespace TEAMModelFunction
                 log.LogInformation($"{exams.ToJsonString()}");
                 foreach (var info in exams)
                 {
-                    List<string> classes = ExamService.getClasses(info);
-                    if (!info.classes.IsNotEmpty())
+                    List<string> classes = ExamService.getClasses(info.classes,info.stuLists);
+                    if (!classes.IsNotEmpty())
                     {
                         continue;
                     }
@@ -239,12 +239,13 @@ namespace TEAMModelFunction
                 log.LogInformation($"{votes.ToJsonString()}");
                 foreach (var info in votes)
                 {
-                    if (!info.classes.IsNotEmpty())
+                    List<string> classes = ExamService.getClasses(info.classes, info.stuLists);
+                    if (classes.IsNotEmpty())
                     {
                         continue;
                     }
 
-                    (List<TmdInfo> tmdids, List<StuInfo> studentss, List<ClassListInfo> classLists) = await TriggerStuActivity.GetStuList(client, _dingDing, info.classes, info.school);
+                    (List<TmdInfo> tmdids, List<StuInfo> studentss, List<ClassListInfo> classLists) = await TriggerStuActivity.GetStuList(client, _dingDing, classes, info.school);
                     List<StuActivity> stuActivities = new List<StuActivity>();
                     List<StuActivity> tmdActivities = new List<StuActivity>();
                     if (tmdids.IsNotEmpty())
@@ -333,11 +334,12 @@ namespace TEAMModelFunction
                 log.LogInformation($"{surveys.ToJsonString()}");
                 foreach (var info in surveys)
                 {
-                    if (!info.classes.IsNotEmpty())
+                    List<string> classes = ExamService.getClasses(info.classes, info.stuLists);
+                    if (!classes.IsNotEmpty())
                     {
                         continue;
                     }
-                    (List<TmdInfo> tmdids, List<StuInfo> studentss, List<ClassListInfo> classLists) = await TriggerStuActivity.GetStuList(client, _dingDing, info.classes, info.school);
+                    (List<TmdInfo> tmdids, List<StuInfo> studentss, List<ClassListInfo> classLists) = await TriggerStuActivity.GetStuList(client, _dingDing, classes, info.school);
                     List<StuActivity> stuActivities = new List<StuActivity>();
                     List<StuActivity> tmdActivities = new List<StuActivity>();
                     if (tmdids.IsNotEmpty())

TEAMModelFunction/TriggerExam.cs

@@ -93,7 +93,7 @@ namespace TEAMModelFunction
                         }
                         break;
                     case "going":
-                        List<string> classes = ExamService.getClasses(info);
+                        List<string> classes = ExamService.getClasses(info.classes,info.stuLists);
                         (List<TmdInfo> tmdids, List<StuInfo> studentss,List<ClassListInfo> classLists) = await TriggerStuActivity.GetStuList(client, _dingDing, classes, info.school);
                         List<StuActivity> stuActivities = new List<StuActivity>();
                         List<StuActivity> tmdActivities = new List<StuActivity>();

TEAMModelFunction/TriggerSurvey.cs

@@ -17,6 +17,7 @@ using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
 using TEAMModelOS.SDK.Module.AzureBlob.Configuration;
+using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelFunction
 {
@@ -73,7 +74,8 @@ namespace TEAMModelFunction
                             }
                             break;
                         case "going":
-                            (List<TmdInfo> tmdids, List<StuInfo> students, List<ClassListInfo> classLists) = await TriggerStuActivity.GetStuList(client, _dingDing, survey.classes, survey.school);
+                            List<string> classes = ExamService.getClasses(survey.classes, survey.stuLists);
+                            (List<TmdInfo> tmdids, List<StuInfo> students, List<ClassListInfo> classLists) = await TriggerStuActivity.GetStuList(client, _dingDing, classes, survey.school);
 #if DEBUG
                             await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}问卷调查{tdata.id}写入学生表作为活动列表！", GroupNames.成都开发測試群組);
 #endif

TEAMModelFunction/TriggerVote.cs

@@ -14,6 +14,7 @@ using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
+using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelFunction
 {
@@ -72,12 +73,13 @@ namespace TEAMModelFunction
                             }
                             break;
                         case "going":
-                            (List<TmdInfo> tmdids, List<StuInfo> students, List<ClassListInfo> classLists) = await TriggerStuActivity.GetStuList(client, _dingDing, vote.classes, vote.school);
+                            List<string> classes = ExamService.getClasses(vote.classes, vote.stuLists);
+                            (List<TmdInfo> tmdids, List<StuInfo> students, List<ClassListInfo> classLists) = await TriggerStuActivity.GetStuList(client, _dingDing, classes, vote.school);
                             await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}投票活动" +
                                 $"{tmdids.ToJsonString()}\n" +
                                 $"{students.ToJsonString()}\n" +
                                 $"{classLists.ToJsonString()}\n" +
-                                $"{vote.classes.ToJsonString()}\n", GroupNames.成都开发測試群組);
+                                $"{classes.ToJsonString()}\n", GroupNames.成都开发測試群組);
                             List<string> tmds = new List<string>();
                             if (tmdids.IsNotEmpty())
                             {

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

@@ -17,6 +17,7 @@ namespace TEAMModelOS.SDK.Models
             pk = "Survey";
             // questions = new List<Question>();
             classes = new List<string>();
+            stuLists = new List<string>();
             tmdids = new List<string>();
         }
         /// <summary>
@@ -55,6 +56,7 @@ namespace TEAMModelOS.SDK.Models
 
         public List<string> tmdids { get; set; }
         public List<string> classes { get; set; }
+        public List<string> stuLists { get; set; }
         /// <summary>
         ///class行政班/teach教学班
         /// </summary>

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

@@ -82,6 +82,7 @@ namespace TEAMModelOS.SDK.Models
         ///  scope 为school时 是学校的班级 class行政班   为private 时是私人班级
         /// </summary>
         public List<string> classes { get; set; }
+        public List<string> stuLists { get; set; }
         /// <summary>
         ///teach教学班
         /// </summary>

TEAMModelOS.SDK/Models/Service/ExamService.cs

@@ -6,21 +6,21 @@ namespace TEAMModelOS.SDK.Models.Service
 {
     public static class ExamService
     {
-        public static List<string> getClasses(ExamInfo info)
+        public static List<string> getClasses(List<string> cla, List<string> stus)
         {
             List<string> classes = new List<string>();
             try
             {
-                if (info.classes.Count > 0)
+                if (cla.Count > 0)
                 {
-                    foreach (string cl in info.classes)
+                    foreach (string cl in cla)
                     {
                         classes.Add(cl);
                     }
                 }
-                if (info.stuLists.Count > 0)
+                if (stus.Count > 0)
                 {
-                    foreach (string stu in info.stuLists)
+                    foreach (string stu in stus)
                     {
                         classes.Add(stu);
                     }

TEAMModelOS/Controllers/Common/ExamController.cs

@@ -100,7 +100,7 @@ namespace TEAMModelOS.Controllers
                     }
                 }
                 int stuCount = 0;
-                List<string> classes = ExamService.getClasses(request);
+                List<string> classes = ExamService.getClasses(request.classes,request.stuLists);
                 for (int i = 0; i < classes.Count; i++)
                 {
                     List<string> ids = new List<string>();