调整名单命名及名单查询方法的说明文档。

TEAMModelOS.FunctionV4/CosmosDB/TriggerExam.cs

@@ -745,7 +745,7 @@ namespace TEAMModelOS.FunctionV4
                     }
                 }
             }
-            (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, classes, info.school, ps);
+            (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, classes, info.school, ps);
             var addStudentsCls = tchList.FindAll(x => x.type == 2);
             var addTmdidsCls = tchList.FindAll(x => x.type == 1);
             List<StuActivity> stuActivities = new List<StuActivity>();

TEAMModelOS.FunctionV4/CosmosDB/TriggerExamLite.cs

@@ -111,7 +111,7 @@ namespace TEAMModelOS.FunctionV4
                                     }
                                 }
                             }
-                            (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, lite.tchLists, lite.school, ps);
+                            (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, lite.tchLists, lite.school, ps);
                             List<StuActivity> tchActivities = new();
                             (string standard, List<string> tmdids, string school, List<string> update, int statistics)  list =    (null,null, null, new List<string> { StatisticsService.TeacherExamLite }, 0)  ;
                             if (tchList.IsNotEmpty())

TEAMModelOS.FunctionV4/CosmosDB/TriggerHomework.cs

@@ -165,7 +165,7 @@ namespace TEAMModelOS.FunctionV4
                 }
             }
             List<string> classes = ExamService.getClasses(work.classes, work.stuLists);
-            (List<RMember> tmdids, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, classes, work.school, ps);
+            (List<RMember> tmdids, List<RGroupList> classLists) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, classes, work.school, ps);
             var addStudentsCls = tmdids.FindAll(x => x.type == 2);
             var addTmdidsCls = tmdids.FindAll(x => x.type == 1);
             List<StuActivity> stuActivities = new();
@@ -282,7 +282,7 @@ namespace TEAMModelOS.FunctionV4
                     });
                 });
             }
-            (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, work.tchLists, work.school, ps);
+            (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, work.tchLists, work.school, ps);
             (string standard, List<string> tmdids, string school, List<string> update, int statistics) list = (null, null, null, new List<string> { StatisticsService.OfflineRecord }, 0);
             if (tchList.IsNotEmpty())
             {

TEAMModelOS.FunctionV4/CosmosDB/TriggerStudy.cs

@@ -112,7 +112,7 @@ namespace TEAMModelOS.FunctionV4
                                         }
                                     }
                                 }
-                                (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, study.tchLists, study.school, ps);
+                                (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, study.tchLists, study.school, ps);
                                 List<StuActivity> tchActivities = new List<StuActivity>();
                                 (string standard, List<string> tmdids, string school, List<string> update, int statistics) list = (null, null, null, new List<string> { StatisticsService.OfflineRecord }, 0);
                                 if (tchList.IsNotEmpty())

TEAMModelOS.FunctionV4/CosmosDB/TriggerSurvey.cs

@@ -120,7 +120,7 @@ namespace TEAMModelOS.FunctionV4
                                 }
                             }
                             List<string> classes = ExamService.getClasses(survey.classes, survey.stuLists);
-                            (List<RMember> tmdIds, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, classes, survey.school);
+                            (List<RMember> tmdIds, List<RGroupList> classLists) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, classes, survey.school);
                             var addStudentsCls = tmdIds.FindAll(x => x.type == 2);
                             var addTmdidsCls = tmdIds.FindAll(x => x.type == 1);
 #if DEBUG
@@ -199,7 +199,7 @@ namespace TEAMModelOS.FunctionV4
                                     }); 
                                 });
                             }
-                            (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, survey.tchLists, survey.school, ps);
+                            (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, survey.tchLists, survey.school, ps);
                             (string standard, List<string> tmdids, string school, List<string> update, int statistics) list = (null, null, null, new List<string> { StatisticsService.TeacherSurvey }, 0);
                             if (tchList.IsNotEmpty())
                             {

TEAMModelOS.FunctionV4/CosmosDB/TriggerVote.cs

@@ -114,7 +114,7 @@ namespace TEAMModelOS.FunctionV4
                                 }
                             }
                             List<string> classes = ExamService.getClasses(vote.classes, vote.stuLists);
-                            (List<RMember> tmdIds, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, classes, vote.school, ps);
+                            (List<RMember> tmdIds, List<RGroupList> classLists) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, classes, vote.school, ps);
                             var addStudentsCls = tmdIds.FindAll(x => x.type == 2);
                             var addTmdidsCls = tmdIds.FindAll(x => x.type == 1);
                             //await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}投票活动" +
@@ -200,7 +200,7 @@ namespace TEAMModelOS.FunctionV4
                                     });
                                 });
                             }
-                            (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, vote.tchLists, vote.school, ps);
+                            (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, vote.tchLists, vote.school, ps);
                             (string standard, List<string> tmdids, string school, List<string> update, int statistics) list = (null, null, null, new List<string> { StatisticsService.TeacherVote }, 0);
                             if (tchList.IsNotEmpty())
                             {

TEAMModelOS.FunctionV4/ServiceBus/ActiveTaskTopic.cs

@@ -786,7 +786,7 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                                 }
                             }
                         }
-                        (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, tch, code, ps);
+                        (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, tch, code, ps);
                         if (tchList.Exists(c => c.id == id))
                         {
                             gname = tchList.Where(c => c.id == id).FirstOrDefault().groupName;
@@ -1583,7 +1583,7 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                                 if (lessonRecord.groupIds.IsNotEmpty())
                                 {
                                     HashSet<string> grades = new HashSet<string>();
-                                    List<GroupListDto> groups = await GroupListService.GetGroupListListids(client, _dingDing, lessonRecord.groupIds, lessonRecord.school);
+                                    List<GroupListDto> groups = await GroupListService.GetGroupListByListids(client, _dingDing, lessonRecord.groupIds, lessonRecord.school);
 
                                     List<GroupListDto> groupLists = groups?.FindAll(x => !string.IsNullOrEmpty(x.periodId) && x.year > 0 && !string.IsNullOrEmpty(x.school));
                                     if (groupLists.IsNotEmpty() && !string.IsNullOrWhiteSpace(lessonRecord.periodId))
@@ -1971,7 +1971,7 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                 }
                 foreach (var cls in courseChange.addClass)
                 {
-                    (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, new List<string> { cls }, courseChange.school);
+                    (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, new List<string> { cls }, courseChange.school);
                     var addStudentsCls = tchList.FindAll(x => x.type == 2);
                     var addTmdidsCls = tchList.FindAll(x => x.type == 1);
                     foreach (var stu in addStudentsCls)
@@ -2053,7 +2053,7 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
 
                 foreach (var list in courseChange.addList)
                 {
-                    (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, new List<string> { list }, courseChange.school);
+                    (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, new List<string> { list }, courseChange.school);
                     var addStudentsCls = tchList.FindAll(x => x.type == 2);
                     var addTmdidsCls = tchList.FindAll(x => x.type == 1);
                     foreach (var stu in addStudentsCls)
@@ -2135,7 +2135,7 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
 
                 foreach (var delCls in courseChange.delClass)
                 {
-                    (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, new List<string> { delCls }, courseChange.school);
+                    (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, new List<string> { delCls }, courseChange.school);
                     var delStudentsCls = tchList.FindAll(x => x.type == 2);
                     var delTmdidsCls = tchList.FindAll(x => x.type == 1);
                     foreach (var stu in delStudentsCls)
@@ -2195,7 +2195,7 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                 }
                 foreach (var delList in courseChange.delList)
                 {
-                    (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, new List<string> { delList }, courseChange.school);
+                    (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, new List<string> { delList }, courseChange.school);
                     var delStudentsCls = tchList.FindAll(x => x.type == 2);
                     var delTmdidsCls = tchList.FindAll(x => x.type == 1);
                     foreach (var stu in delStudentsCls)

TEAMModelOS.SDK/Models/Service/ActivityService.cs

@@ -599,7 +599,7 @@ namespace TEAMModelOS.SDK
             {
                 List<Task<ItemResponse<StuActivity>>> tasks = new List<Task<ItemResponse<StuActivity>>>();
                 List<string> classes = ExamService.getClasses(activity.classes, activity.stuLists);
-                (List<RMember> tmdIds, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, classes, activity.school);
+                (List<RMember> tmdIds, List<RGroupList> classLists) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, classes, activity.school);
                 var students = tmdIds.FindAll(x => x.type == 2);
                 var tmdids = tmdIds.FindAll(x => x.type == 1);
                 if (tmdids.IsNotEmpty())
@@ -772,7 +772,7 @@ namespace TEAMModelOS.SDK
                 }
             }
             List<string> classes = ExamService.getClasses(activityList.classes, activityList.stuLists);
-            (List<RMember> tmdIds, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, classes, activityList.school, ps);
+            (List<RMember> tmdIds, List<RGroupList> classLists) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, classes, activityList.school, ps);
             var addStudentsCls = tmdIds.FindAll(x => x.type == 2);
             var addTmdidsCls = tmdIds.FindAll(x => x.type == 1);
             List<string> tmds = new List<string>();
@@ -805,7 +805,7 @@ namespace TEAMModelOS.SDK
                     });
                 });
             }
-            (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, activityList.tchLists, activityList.school, ps);
+            (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, activityList.tchLists, activityList.school, ps);
             (string standard, List<string> tmdids, string school, List<string> update, int statistics) list = (null, null, null, new List<string> { StatisticsService.TeacherVote }, 0);
             if (tchList.IsNotEmpty())
             {

TEAMModelOS.SDK/Models/Service/GroupListService.cs

@@ -513,7 +513,7 @@ namespace TEAMModelOS.SDK
             return list;
         }
         /// <summary>
-        /// 
+        ///根据任意名单id获取名单摘要信息。
         /// </summary>
         /// <param name="client"></param>
         /// <param name="_dingDing"></param>
@@ -522,7 +522,7 @@ namespace TEAMModelOS.SDK
         /// <param name="SummarySql"></param>
         /// <param name="graduate">毕业类型0在校，1毕业 ， -1查全部。</param>
         /// <returns></returns>
-        public static async Task<List<GroupListDto>> GetGroupListListids(CosmosClient client, DingDing _dingDing, List<string> classes, string school,
+        public static async Task<List<GroupListDto>> GetGroupListByListids(CosmosClient client, DingDing _dingDing, List<string> classes, string school,
             string SummarySql = " c.id,c.code,c.name,c.no,c.periodId,c.scope,c.school,c.creatorId,c.type,c.year,c.tcount,c.scount,c.leader ,c.froms ,c.joinLock " ,int graduate = -1)
         {
             classes.RemoveAll(x => x == null);
@@ -661,7 +661,7 @@ namespace TEAMModelOS.SDK
             return groupLists;
         }
         /// <summary>
-        /// 
+        ///  根据任意名单id获取成员信息。rmembers是去重的信息，groups是名单及人员信息，同一个人可能在不同的名单内。
         /// </summary>
         /// <param name="_coreAPIHttpService"></param>
         /// <param name="client"></param>
@@ -671,7 +671,7 @@ namespace TEAMModelOS.SDK
         /// <param name="groupids"></param>
         /// <param name="graduate">毕业类型0在校，1毕业 ， -1查全部。</param>
         /// <returns></returns>
-        public static async Task<(List<RMember>, List<RGroupList> groups)> GetStutmdidListids(CoreAPIHttpService _coreAPIHttpService, CosmosClient client, DingDing _dingDing, 
+        public static async Task<(List<RMember>rmembers, List<RGroupList> groups)> GetMemberByListids(CoreAPIHttpService _coreAPIHttpService, CosmosClient client, DingDing _dingDing, 
             List<string> classes, string school, List<(string, List<string>)> groupids = null,  int graduate = -1)
         {
             List<RMember> members = new List<RMember>();
@@ -953,7 +953,7 @@ namespace TEAMModelOS.SDK
             }
         }
         /// <summary>
-        /// 
+        /// 根据名单类型获取名单及成员信息。
         /// </summary>
         /// <param name="_coreAPIHttpService"></param>
         /// <param name="client"></param>
@@ -1020,7 +1020,7 @@ namespace TEAMModelOS.SDK
             return lists;
         }
         /// <summary>
-        /// 
+        /// 根据名单类型，名单分组信息获取成员信息， rmembers是去重的信息，groups是名单及人员信息，同一个人可能在不同的名单内。
         /// </summary>
         /// <param name="_coreAPIHttpService"></param>
         /// <param name="client"></param>

TEAMModelOS/Controllers/Analysis/AnalysisController.cs

@@ -340,7 +340,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 }
                 //以班级为单位(此处处理的是行政班级,教学班如果被移除则会无法分析)
                 List<string> clas = ExamService.getClasses(info.classes, info.stuLists);
-                (List<RMember> members, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, clas, info.school, null);
+                (List<RMember> members, List<RGroupList> classLists) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, clas, info.school, null);
                 foreach (RGroupList rGroup in classLists)
                 {
                    /* Class classroom = null;

TEAMModelOS/Controllers/Both/GroupListController.cs

@@ -545,7 +545,7 @@ namespace TEAMModelOS.Controllers
                 }
             }
             List<string> listids = ids.ToObject<List<string>>();
-            (List<RMember> members, List<RGroupList> groups) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, listids, $"{schoolId}", ps);
+            (List<RMember> members, List<RGroupList> groups) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, listids, $"{schoolId}", ps);
             return Ok(new { groups, members });
         }
         /// <summary>
@@ -563,7 +563,7 @@ namespace TEAMModelOS.Controllers
             if (!json.TryGetProperty("ids", out JsonElement ids)) return BadRequest();
             json.TryGetProperty("schoolId", out JsonElement schoolId);
             List<string> listids = ids.ToObject<List<string>>();
-            List<GroupListDto> groups = await GroupListService.GetGroupListListids(client, _dingDing, listids, $"{schoolId}", SummarySql);
+            List<GroupListDto> groups = await GroupListService.GetGroupListByListids(client, _dingDing, listids, $"{schoolId}", SummarySql);
             return Ok(new { groups });
         }
         /// <summary>

TEAMModelOS/Controllers/Both/LessonRecordController.cs

@@ -399,7 +399,7 @@ namespace TEAMModelOS.Controllers
             if (records.Any()) {
                 var groupIds= records.SelectMany(x => x.groupIds).ToHashSet();
                 if (groupIds.Any()) {
-                    var groups = await GroupListService.GetGroupListListids(_azureCosmos.GetCosmosClient(), _dingDing, groupIds.ToList(), school," c.id ");
+                    var groups = await GroupListService.GetGroupListByListids(_azureCosmos.GetCosmosClient(), _dingDing, groupIds.ToList(), school," c.id ");
                     //获取已经被删除的名单。
                     var idsExp =  groupIds.Except(groups.Select(x => x.id));
                     if (idsExp.Any()) {
@@ -597,7 +597,7 @@ namespace TEAMModelOS.Controllers
             var groupIds = lessonRecords.SelectMany(x => x.groupIds);
             if (groupIds.Any())
             {
-                List<GroupListDto> groupLists = await GroupListService.GetGroupListListids(_azureCosmos.GetCosmosClient(), _dingDing, groupIds.ToList(), school);
+                List<GroupListDto> groupLists = await GroupListService.GetGroupListByListids(_azureCosmos.GetCosmosClient(), _dingDing, groupIds.ToList(), school);
                 lessonRecords.ForEach(x => {
                     List<string> groupNmae = new List<string>();
                     x.groupIds.ForEach(y => {
@@ -811,7 +811,7 @@ namespace TEAMModelOS.Controllers
                 }
                 var groupIds = lessonRecords.SelectMany(x => x.groupIds);
                 if (groupIds.Any()) {
-                   List<GroupListDto> groupLists= await GroupListService.GetGroupListListids(_azureCosmos.GetCosmosClient(), _dingDing, groupIds.ToList(), school);
+                   List<GroupListDto> groupLists= await GroupListService.GetGroupListByListids(_azureCosmos.GetCosmosClient(), _dingDing, groupIds.ToList(), school);
                     lessonRecords.ForEach(x => {
                         List<string> groupNmae = new List<string>();
                         x.groupIds.ForEach(y => {

TEAMModelOS/Controllers/Client/HiScanController.cs

@@ -212,7 +212,7 @@ namespace TEAMModelOS.Controllers.Core
                         pexamRcds.AddRange(ppexamRcds);
                     }
                 }
-                (List<RMember> tmdIds, List<RGroupList> classInfo) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, classesSet.ToList(), $"{_schoolId}");
+                (List<RMember> tmdIds, List<RGroupList> classInfo) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, classesSet.ToList(), $"{_schoolId}");
                 /*var addStudentsCls = tmdIds.FindAll(x => x.type == 2);
                 var addTmdidsCls = tmdIds.FindAll(x => x.type == 1);*/
                 List<SheetConfig> configsN = new List<SheetConfig>();
@@ -410,7 +410,7 @@ namespace TEAMModelOS.Controllers.Core
                     }
                 }
                 
-                (List<RMember> tmdIds, List<RGroupList> classInfo) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, classesSet.ToList(), $"{_schoolId}");
+                (List<RMember> tmdIds, List<RGroupList> classInfo) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, classesSet.ToList(), $"{_schoolId}");
                 List<SheetConfig> configsN = new List<SheetConfig>();
                 if (examData.sheet != null) {
                     if (examData.sheet.scope.Equals("school"))

TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -216,7 +216,7 @@ namespace TEAMModelOS.Controllers.Client
                     sbm.Add(messageBlob);
                 }
                 //取得學校或個人名單
-                (List<RMember> students, _) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, db, _dingDing, new List<string>() { request.sid }, request.school);
+                (List<RMember> students, _) = await GroupListService.GetMemberByListids(_coreAPIHttpService, db, _dingDing, new List<string>() { request.sid }, request.school);
                 //觸發IMEI更新消息
                 var stus = students.Select(x => x.id).ToList();
                 var imeimsg = new ServiceBusMessage(new { request.channel, userid = request.did, request.school, stus }.ToJsonString());
@@ -1386,7 +1386,7 @@ namespace TEAMModelOS.Controllers.Client
             {
                 listids.Add(classId);
             }
-            (List<RMember> students, List<RGroupList> groupList) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, listids, $"{school_code}");
+            (List<RMember> students, List<RGroupList> groupList) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, listids, $"{school_code}");
 
             return Ok(new { students });
         }

TEAMModelOS/Controllers/Client/HiTeachccControlller.cs

@@ -187,7 +187,7 @@ namespace TEAMModelOS.Controllers.Client
                 }
 
                 //取得學校或個人名單
-                (List<RMember> students, _) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, db, _dingDing, new List<string>() { request.sid }, request.school);
+                (List<RMember> students, _) = await GroupListService.GetMemberByListids(_coreAPIHttpService, db, _dingDing, new List<string>() { request.sid }, request.school);
                 //觸發IMEI更新消息
                 var stus = students.Select(x => x.id).ToList();
                 var imeimsg = new ServiceBusMessage(new { request.channel, userid = tid, request.school, stus }.ToJsonString());

TEAMModelOS/Controllers/Common/AreaController.cs

@@ -453,7 +453,7 @@ namespace TEAMModelOS.Controllers
                 {
                     var sJson = await JsonDocument.ParseAsync(aresponse.ContentStream);
                     Study study = sJson.ToObject<Study>();
-                    (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, study.tchLists, study.school);
+                    (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, study.tchLists, study.school);
                     teac = tchList;
                     var query = $"select value(c) from c where c.pId = '{id}'";
                     foreach ((string code, string name) in baseIds)
@@ -616,7 +616,7 @@ namespace TEAMModelOS.Controllers
                                 {
                                     JsonElement account = accounts.Current;
                                     List<string> tcs = account.GetProperty("tchLists").ToObject<List<string>>();
-                                    (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, tcs, code);
+                                    (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, tcs, code);
                                     // (List<TmdInfo> tmdInfos, List<ClassListInfo> classInfos) = await TriggerStuActivity.GetTchList(client, _dingDing, ids, $"{school}");
                                     //(List<TmdInfo> tchList, _) = await TriggerStuActivity.GetTchList(client, _dingDing, tcs, code);
                                     recordUrl.Add((code, name, account.GetProperty("recordUrl").GetString(), tchList.Count));
@@ -709,7 +709,7 @@ namespace TEAMModelOS.Controllers
                                 {
                                     JsonElement account = accounts.Current;
                                     List<string> tcs = account.GetProperty("tchLists").ToObject<List<string>>();
-                                    (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, tcs, code);
+                                    (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, tcs, code);
                                     // (List<TmdInfo> tmdInfos, List<ClassListInfo> classInfos) = await TriggerStuActivity.GetTchList(client, _dingDing, ids, $"{school}");
                                     //(List<TmdInfo> tchList, _) = await TriggerStuActivity.GetTchList(client, _dingDing, tcs, code);
 

TEAMModelOS/Controllers/Common/ExamController.cs

@@ -122,7 +122,7 @@ namespace TEAMModelOS.Controllers
 
 
                 List<string> classes = ExamService.getClasses(request.classes, request.stuLists);
-                (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, classes, request.school, ps);
+                (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, classes, request.school, ps);
                 request.stuCount = tchList.Count;
 
                 /*for (int i = 0; i < classes.Count; i++)
@@ -1379,7 +1379,7 @@ namespace TEAMModelOS.Controllers
                 {
                     classId.GetString()
                 };
-                (List<RMember> members, List<RGroupList> groups) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, cid, $"{school}");
+                (List<RMember> members, List<RGroupList> groups) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, cid, $"{school}");
                 //await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<GroupList>(classId.GetString, new PartitionKey($"Exam-{code}"));
                 ///获取真实的名称 
                 List<ufo> ufos = new();

TEAMModelOS/Controllers/Common/ExamLiteController.cs

@@ -265,7 +265,7 @@ namespace TEAMModelOS.Controllers.Common
                 ExamLite examLite = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<ExamLite>(id.GetString(), new PartitionKey($"ExamLite-{code}"));
                 if (examLite != null)
                 {
-                    (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, examLite.tchLists, examLite.school);
+                    (List<RMember> tchList, List<RGroupList> classInfos) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, examLite.tchLists, examLite.school);
                     // (List<TmdInfo> tmdInfos, List<ClassListInfo> classInfos) = await TriggerStuActivity.GetTchList(client, _dingDing, ids, $"{school}");
                    // (List<TmdInfo> tchList, _) = await TriggerStuActivity.GetTchList(client, _dingDing, examLite.tchLists, examLite.school);
                     return Ok(new { examLite, teachers = tchList.Select(t => t.id).ToList(), status = 200 });

TEAMModelOS/Controllers/Common/HomeworkController.cs

@@ -487,7 +487,7 @@ namespace TEAMModelOS.Controllers.Learn
                             if (!request.TryGetProperty("listIds", out JsonElement _listIds)) return BadRequest();
                             List<string> listIds = _listIds.ToJsonString().ToObject<List<string>>();
                             List<TypeUser> typeUsers = new List<TypeUser>();
-                            (List<RMember> tmdinfos, List<RGroupList> classInfo) = await GroupListService.GetStutmdidListids(_coreAPIHttpService,client, _dingDing, listIds, homework.school);
+                            (List<RMember> tmdinfos, List<RGroupList> classInfo) = await GroupListService.GetMemberByListids(_coreAPIHttpService,client, _dingDing, listIds, homework.school);
                             var addStudentsCls = tmdinfos.FindAll(x => x.type == 2);
                             var addTmdidsCls = tmdinfos.FindAll(x => x.type == 1);
                             if ($"{_targetType}".Equals("research", StringComparison.OrdinalIgnoreCase) || $"{_targetType}".Equals("yxtrain", StringComparison.OrdinalIgnoreCase))

TEAMModelOS/Controllers/Common/StudyController.cs

@@ -348,7 +348,7 @@ namespace TEAMModelOS.Controllers.Common
                     }
                     try
                     {
-                        (List<RMember> members, List<RGroupList> groups) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, study.tchLists, study.school, ps);
+                        (List<RMember> members, List<RGroupList> groups) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, study.tchLists, study.school, ps);
                         await StatisticsService.DoChange(new TeacherTrainChange
                         { standard = standard, tmdids = members.Select(x => x.id)?.ToList(), school = study.school, update = new HashSet<string> { StatisticsService.OfflineRecord }, statistics = 0 }, _azureCosmos);
                     }
@@ -479,7 +479,7 @@ namespace TEAMModelOS.Controllers.Common
                 Study study = await client.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<Study>(id.GetString(), new PartitionKey($"Study-{code}"));
                 if (study != null)
                 {
-                    (List<RMember> tchList, List<RGroupList> classInfo) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, study.tchLists, study.school);
+                    (List<RMember> tchList, List<RGroupList> classInfo) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, study.tchLists, study.school);
                     List<StudyRecord> records = new();
 
                     foreach (var member in tchList)

TEAMModelOS/Controllers/Normal/AbilitySubController.cs

@@ -1154,7 +1154,7 @@ namespace TEAMModelOS.Controllers
                 {
                     ids.Add("default");
                 }
-                (List<RMember> tmdInfos, List<RGroupList> classInfos) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, ids, $"{_school}");
+                (List<RMember> tmdInfos, List<RGroupList> classInfos) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, ids, $"{_school}");
                 List<GroupMember> teachers = new List<GroupMember>();
                 foreach (var classInfo in classInfos)
                 {

TEAMModelOS/Controllers/OpenApi/OpenApiService.cs

@@ -168,7 +168,7 @@ namespace TEAMModelOS.Controllers
                 var groupIds = records.SelectMany(x => x.groupIds).ToHashSet();
                 if (groupIds.Any())
                 {
-                    var groups = await GroupListService.GetGroupListListids(_azureCosmos.GetCosmosClient(), _dingDing, groupIds.ToList(), school, " c.id ");
+                    var groups = await GroupListService.GetGroupListByListids(_azureCosmos.GetCosmosClient(), _dingDing, groupIds.ToList(), school, " c.id ");
                     //获取已经被删除的名单。
                     var idsExp = groupIds.Except(groups.Select(x => x.id));
                     if (idsExp.Any())
@@ -383,7 +383,7 @@ namespace TEAMModelOS.Controllers
                 var groupIds = lessonRecords.SelectMany(x => x.groupIds);
                 if (groupIds.Any())
                 {
-                    List<GroupListDto> groupLists = await GroupListService.GetGroupListListids(_azureCosmos.GetCosmosClient(), _dingDing, groupIds.ToList(), school);
+                    List<GroupListDto> groupLists = await GroupListService.GetGroupListByListids(_azureCosmos.GetCosmosClient(), _dingDing, groupIds.ToList(), school);
                     lessonRecords.ForEach(x => {
                         List<string> groupNmae = new List<string>();
                         x.groupIds.ForEach(y => {
@@ -585,7 +585,7 @@ namespace TEAMModelOS.Controllers
                 var client = _azureCosmos.GetCosmosClient();
                 if (!json.TryGetProperty("ids", out JsonElement ids)) return new ResponseData<dynamic>() { code = RespondCode.NotFound, msg = "参数错误" };
                 List<string> listids = ids.ToObject<List<string>>();
-                (List<RMember> members, List<RGroupList> tGroups) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, listids, $"{school}");
+                (List<RMember> members, List<RGroupList> tGroups) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, listids, $"{school}");
                 groups = tGroups.Select(x => new OGgroup { name = x.name, no = x.no, periodId = x.periodId, school = x.school, type = x.type, year = x.year, tcount = x.tcount, scount = x.scount, leader = x.leader, members = x.members, id = x.id }).ToList();
                 return new ResponseData<dynamic>() { code = RespondCode.Ok, msg = "成功", data = new { groups, members } };
 
@@ -892,7 +892,7 @@ namespace TEAMModelOS.Controllers
                     }
                     List<OGroupList> groupLists = new List<OGroupList>();
                     if (classIds.Any()) {
-                    var tempGroupLists=   await  GroupListService.GetGroupListListids(_azureCosmos.GetCosmosClient(), _dingDing, classIds.ToList(), school);
+                    var tempGroupLists=   await  GroupListService.GetGroupListByListids(_azureCosmos.GetCosmosClient(), _dingDing, classIds.ToList(), school);
                         groupLists = tempGroupLists.Select(x => new OGroupList { id = x.id, name = x.name, type = x.type, periodId = x.periodId, school = x.school, scope = x.scope, year = x.year }).ToList();
                     }
 

TEAMModelOS/Controllers/OpenApi/OpenSchool/ScCourseController.cs

@@ -501,7 +501,7 @@ namespace TEAMModelOS.Controllers
                 groupIds.AddRange(stulistsNotTime);
             }
 
-            List<GroupListDto> groupListDtos = await GroupListService.GetGroupListListids(_azureCosmos.GetCosmosClient(), _dingDing, groupIds, school);
+            List<GroupListDto> groupListDtos = await GroupListService.GetGroupListByListids(_azureCosmos.GetCosmosClient(), _dingDing, groupIds, school);
             IEnumerable<string> unexistGroupIds = null;
             if (groupListDtos.IsNotEmpty())
             {

TEAMModelOS/Controllers/Teacher/ClassVideoController.cs

@@ -98,7 +98,7 @@ namespace TEAMModelOS.Controllers
                 {
                     ids.Add("default");
                 }
-                (List<RMember> tmdInfos, List<RGroupList> classInfos) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, ids, $"{_school}");
+                (List<RMember> tmdInfos, List<RGroupList> classInfos) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, ids, $"{_school}");
                 if (classInfos.IsNotEmpty())
                 {
                     List<dynamic> groupMembers = new List<dynamic>();
@@ -194,7 +194,7 @@ namespace TEAMModelOS.Controllers
                 if (!ids.IsNotEmpty()) {
                     ids.Add("default");
                 }
-                (List<RMember> tmdInfos, List<RGroupList> classInfos) = await GroupListService.GetStutmdidListids(_coreAPIHttpService, client, _dingDing, ids, $"{_school}");
+                (List<RMember> tmdInfos, List<RGroupList> classInfos) = await GroupListService.GetMemberByListids(_coreAPIHttpService, client, _dingDing, ids, $"{_school}");
                 List<dynamic> classVideos = new();
                 string code = $"ClassVideo-{_school}";
                 foreach (var listInfo in classInfos) {

TEAMModelOS/Controllers/XTest/FixDataController.cs

@@ -2208,7 +2208,7 @@ namespace TEAMModelOS.Controllers
             foreach (var item in lists) {
                 var gids = item.list.SelectMany(x => x.groupIds).Where(y => !string.IsNullOrWhiteSpace(y));
                 HashSet<string> grades = new HashSet<string>();
-                List<GroupListDto> groups = await GroupListService.GetGroupListListids(client, _dingDing, gids.ToList(), item.key);
+                List<GroupListDto> groups = await GroupListService.GetGroupListByListids(client, _dingDing, gids.ToList(), item.key);
                 List<GroupListDto> groupLists = groups?.FindAll(x => !string.IsNullOrEmpty(x.periodId) && !string.IsNullOrEmpty(x.school));
                 dict.Add(item.key, groupLists);
             }