浏览代码

统一调整分组数据类型

zhouj1203@hotmail.com 3 年之前
父节点
当前提交
97d58dad64

+ 6 - 2
TEAMModelFunction/TriggerExam.cs

@@ -104,9 +104,13 @@ namespace TEAMModelFunction
                                 List<(string pId, List<string> gid)> ps = new List<(string pId, List<string> gid)>();
                                 if (info.groupLists.Count > 0)
                                 {
-                                    foreach (var gp in info.groupLists)
+                                    var group = info.groupLists;
+                                    foreach (var gp in group)
                                     {
-                                        ps.Add((gp.Key, gp.Value));
+                                        foreach (KeyValuePair<string, List<string>> pp in gp)
+                                        {
+                                            ps.Add((pp.Key, pp.Value));
+                                        }
                                     }
                                 }
                                 List<string> classes = ExamService.getClasses(info.classes, info.stuLists);

+ 6 - 2
TEAMModelFunction/TriggerExamLite.cs

@@ -73,9 +73,13 @@ namespace TEAMModelFunction
                             List<(string pId, List<string> gid)> ps = new List<(string pId, List<string> gid)>();
                             if (lite.groupLists.Count > 0)
                             {
-                                foreach (var gp in lite.groupLists)
+                                var group = lite.groupLists;
+                                foreach (var gp in group)
                                 {
-                                    ps.Add((gp.Key, gp.Value));
+                                    foreach (KeyValuePair<string, List<string>> pp in gp)
+                                    {
+                                        ps.Add((pp.Key, pp.Value));
+                                    }
                                 }
                             }
                             (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetStutmdidListids(client, _dingDing, lite.tchLists, lite.school, ps);

+ 6 - 2
TEAMModelFunction/TriggerHomework.cs

@@ -74,9 +74,13 @@ namespace TEAMModelFunction
                             List<(string pId, List<string> gid)> ps = new List<(string pId, List<string> gid)>();
                             if (work.groupLists.Count > 0)
                             {
-                                foreach (var gp in work.groupLists)
+                                var group = work.groupLists;
+                                foreach (var gp in group)
                                 {
-                                    ps.Add((gp.Key, gp.Value));
+                                    foreach (KeyValuePair<string, List<string>> pp in gp)
+                                    {
+                                        ps.Add((pp.Key, pp.Value));
+                                    }
                                 }
                             }
                             List<string> classes = ExamService.getClasses(work.classes, work.stuLists);

+ 6 - 2
TEAMModelFunction/TriggerSurvey.cs

@@ -81,9 +81,13 @@ namespace TEAMModelFunction
                         case "going":
                             List<(string pId, List<string> gid)> ps = new List<(string pId, List<string> gid)>();
                             if (survey.groupLists.Count >0) {
-                                foreach (var gp in survey.groupLists)
+                                var group = survey.groupLists;
+                                foreach (var gp in group)
                                 {
-                                    ps.Add((gp.Key, gp.Value));
+                                    foreach (KeyValuePair<string, List<string>> pp in gp)
+                                    {
+                                        ps.Add((pp.Key, pp.Value));
+                                    }
                                 }
                             }                          
                             List<string> classes = ExamService.getClasses(survey.classes, survey.stuLists);

+ 6 - 2
TEAMModelFunction/TriggerVote.cs

@@ -82,9 +82,13 @@ namespace TEAMModelFunction
                             List<(string pId, List<string> gid)> ps = new List<(string pId, List<string> gid)>();
                             if (vote.groupLists.Count > 0)
                             {
-                                foreach (var gro in vote.groupLists)
+                                var group = vote.groupLists;
+                                foreach (var gp in group)
                                 {
-                                    ps.Add((gro.Key, gro.Value));
+                                    foreach (KeyValuePair<string, List<string>> pp in gp)
+                                    {
+                                        ps.Add((pp.Key, pp.Value));
+                                    }
                                 }
                             }
                             List<string> classes = ExamService.getClasses(vote.classes, vote.stuLists);

+ 1 - 1
TEAMModelOS.SDK/Models/Cosmos/Common/ExamLite.cs

@@ -53,7 +53,7 @@ namespace TEAMModelOS.SDK.Models
         /// 教研组名单
         /// </summary>
         public List<string> tchLists { get; set; } = new List<string>();
-        public List<KeyValuePair<string, List<string>>> groupLists { get; set; } = new List<KeyValuePair<string, List<string>>>();
+        public List<Dictionary<string, List<string>>> groupLists { get; set; } = new List<Dictionary<string, List<string>>>();
         /// <summary>
         /// student 学生名单类型    research 教研组名单
         /// </summary>

+ 1 - 1
TEAMModelOS.SDK/Models/Cosmos/Common/Homework.cs

@@ -64,7 +64,7 @@ namespace TEAMModelOS.SDK.Models
         /// 教研组名单
         /// </summary>
         public List<string> tchLists { get; set; } = new List<string>();
-        public List<KeyValuePair<string, List<string>>> groupLists { get; set; } = new List<KeyValuePair<string, List<string>>>();
+        public List<Dictionary<string, List<string>>> groupLists { get; set; } = new List<Dictionary<string, List<string>>>();
         /// <summary>
         /// student 学生名单类型    research 教研组名单
         /// </summary>

+ 1 - 1
TEAMModelOS.SDK/Models/Cosmos/Common/Survey.cs

@@ -67,7 +67,7 @@ namespace TEAMModelOS.SDK.Models
         /// 教研组名单
         /// </summary>
         public List<string> tchLists { get; set; } = new List<string>();
-        public List<KeyValuePair<string, List<string>>> groupLists { get; set; } = new List<KeyValuePair<string, List<string>>>();
+        public List<Dictionary<string, List<string>>> groupLists { get; set; } = new List<Dictionary<string, List<string>>>();
         /// <summary>
         /// student 学生名单类型    research 教研组名单
         /// </summary>

+ 1 - 1
TEAMModelOS.SDK/Models/Cosmos/Common/Vote.cs

@@ -90,7 +90,7 @@ namespace TEAMModelOS.SDK.Models
         /// 教研组名单
         /// </summary>
         public List<string> tchLists { get; set; } = new List<string>();
-        public List<KeyValuePair<string, List<string>>> groupLists { get; set; } = new List<KeyValuePair<string, List<string>>>();
+        public List<Dictionary<string, List<string>>> groupLists { get; set; } = new List<Dictionary<string, List<string>>>();
         /// <summary>
         /// student 学生名单类型    research 教研组名单
         /// </summary>

+ 1 - 1
TEAMModelOS.SDK/Models/Cosmos/School/ExamInfo.cs

@@ -73,7 +73,7 @@ namespace TEAMModelOS.SDK.Models
         public List<string> classes { get; set; }
         public List<string> stuLists { get; set; }
         //标记名单与名单分组关系
-        public List<KeyValuePair<string, List<string>>> groupLists { get; set; } = new List<KeyValuePair<string, List<string>>>();
+        public List<Dictionary<string, List<string>>> groupLists { get; set; } = new List<Dictionary<string, List<string>>>();
         /// <summary>
         /// 发布对象全部信息。由前端操作,用于前端回显发布对象的格式。
         /// </summary>