CrazyIter_Bin il y a 3 ans
Parent
commit
69cfb3c653

+ 0 - 4
TEAMModelFunction/ActivityHttpTrigger.cs

@@ -75,7 +75,6 @@ namespace TEAMModelFunction
                             (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(client, _dingDing, new List<string>() { sc.stulist }, course.school);
                             var addStudentsCls = tchList.FindAll(x => x.type == 2);
                             var addTmdidsCls = tchList.FindAll(x => x.type == 1);
-                            //(List<TmdInfo> tmdids, List<StuInfo> students, List<ClassListInfo> classLists) = await TriggerStuActivity.GetStuList(client, _dingDing, new List<string>() { sc.stulist }, course.school);
                             foreach (var addStu in addStudentsCls)
                             {
                                 var stuCourse = new StuCourse
@@ -159,7 +158,6 @@ namespace TEAMModelFunction
                     (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(client, _dingDing, classes, info.school);
                     var addStudentsCls = tchList.FindAll(x => x.type == 2);
                     var addTmdidsCls = tchList.FindAll(x => x.type == 1);
-                    //(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 (addTmdidsCls.IsNotEmpty())
@@ -262,7 +260,6 @@ namespace TEAMModelFunction
                     (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(client, _dingDing, classes, info.school);
                     var addStudentsCls = tchList.FindAll(x => x.type == 2);
                     var addTmdidsCls = tchList.FindAll(x => x.type == 1);
-                    //(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 (addTmdidsCls.IsNotEmpty())
@@ -365,7 +362,6 @@ namespace TEAMModelFunction
                     (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(client, _dingDing, classes, info.school);
                     var addStudentsCls = tchList.FindAll(x => x.type == 2);
                     var addTmdidsCls = tchList.FindAll(x => x.type == 1);
-                    //(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 (addTmdidsCls.IsNotEmpty())

+ 0 - 4
TEAMModelFunction/CourseServiceBus.cs

@@ -50,7 +50,6 @@ namespace TEAMModelFunction
                     (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(client, _dingDing, new List<string> { cls }, courseChange.school);
                     var addStudentsCls = tchList.FindAll(x => x.type == 2);
                     var addTmdidsCls = tchList.FindAll(x => x.type == 1);
-                    //(List<TmdInfo> addTmdidsCls, List<StuInfo> addStudentsCls, List<ClassListInfo> classLists) = await TriggerStuActivity.GetStuList(client, _dingDing, new List<string> { cls }, courseChange.school);
                     foreach (var stu in addStudentsCls)
                     {
                         try
@@ -119,7 +118,6 @@ namespace TEAMModelFunction
 
                 foreach (var list in courseChange.addList)
                 {
-                    //(List<TmdInfo> addTmdidsCls, List<StuInfo> addStudentsCls, List<ClassListInfo> classLists) = await TriggerStuActivity.GetStuList(client, _dingDing, new List<string> { list }, courseChange.school);
                     (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(client, _dingDing, new List<string> { list }, courseChange.school);
                     var addStudentsCls = tchList.FindAll(x => x.type == 2);
                     var addTmdidsCls = tchList.FindAll(x => x.type == 1);
@@ -192,7 +190,6 @@ namespace TEAMModelFunction
 
                 foreach (var delCls in courseChange.delClass)
                 {
-                    //(List<TmdInfo> delTmdidsCls, List<StuInfo> delStudentsCls, List<ClassListInfo> classLists) = await TriggerStuActivity.GetStuList(client, _dingDing, new List<string> { delCls }, courseChange.school);
                     (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(client, _dingDing, new List<string> { delCls }, courseChange.school);
                     var delStudentsCls = tchList.FindAll(x => x.type == 2);
                     var delTmdidsCls = tchList.FindAll(x => x.type == 1);
@@ -253,7 +250,6 @@ namespace TEAMModelFunction
                 }
                 foreach (var delList in courseChange.delList)
                 {
-                    //(List<TmdInfo> delTmdidsCls, List<StuInfo> delStudentsCls, List<ClassListInfo> classLists) = await TriggerStuActivity.GetStuList(client, _dingDing, new List<string> { delList }, courseChange.school);
                     (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(client, _dingDing, new List<string> { delList }, courseChange.school);
                     var delStudentsCls = tchList.FindAll(x => x.type == 2);
                     var delTmdidsCls = tchList.FindAll(x => x.type == 1);

+ 1 - 1
TEAMModelFunction/MonitorServicesBus.cs

@@ -426,7 +426,7 @@ namespace TEAMModelFunction
             }
             catch (Exception ex)
             {
-                await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StuListServiceBus-StuList\n{ex.Message}\n{ex.StackTrace}\n{msg}", GroupNames.成都开发測試群組);
+                await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-GroupChange-GroupChange\n{ex.Message}\n{ex.StackTrace}\n{msg}", GroupNames.成都开发測試群組);
             }
         }
         [FunctionName("ItemCond")]

+ 0 - 1
TEAMModelFunction/TriggerExam.cs

@@ -105,7 +105,6 @@ namespace TEAMModelFunction
                                 (List<RMember> tchList, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(client, _dingDing, classes, info.school);
                                 var addStudentsCls = tchList.FindAll(x => x.type == 2);
                                 var addTmdidsCls = tchList.FindAll(x => x.type == 1);
-                                //(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 (addTmdidsCls.IsNotEmpty())

+ 0 - 1
TEAMModelFunction/TriggerHomework.cs

@@ -72,7 +72,6 @@ namespace TEAMModelFunction
                             break;
                         case "going":
                             List<string> classes = ExamService.getClasses(work.classes, work.stuLists);
-                            //(List<TmdInfo> tmdids, List<StuInfo> students, List<ClassListInfo> classLists) = await TriggerStuActivity.GetStuList(client, _dingDing, classes, work.school);
                             (List<RMember> tmdids, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(client, _dingDing, classes, work.school);
                             var addStudentsCls = tmdids.FindAll(x => x.type == 2);
                             var addTmdidsCls = tmdids.FindAll(x => x.type == 1);

+ 0 - 1
TEAMModelFunction/TriggerSurvey.cs

@@ -80,7 +80,6 @@ namespace TEAMModelFunction
                             break;
                         case "going":
                             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);
                             (List<RMember> tmdIds, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(client, _dingDing, classes, survey.school);
                             var addStudentsCls = tmdIds.FindAll(x => x.type == 2);
                             var addTmdidsCls = tmdIds.FindAll(x => x.type == 1);

+ 0 - 1
TEAMModelFunction/TriggerVote.cs

@@ -80,7 +80,6 @@ namespace TEAMModelFunction
                             break;
                         case "going":
                             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);
                             (List<RMember> tmdIds, List<RGroupList> classLists) = await GroupListService.GetStutmdidListids(client, _dingDing, classes, vote.school);
                             var addStudentsCls = tmdIds.FindAll(x => x.type == 2);
                             var addTmdidsCls = tmdIds.FindAll(x => x.type == 1);

+ 0 - 2
TEAMModelOS/Controllers/Client/HiScanController.cs

@@ -187,7 +187,6 @@ namespace TEAMModelOS.Controllers.Core
                         pexamRcds.AddRange(ppexamRcds);
                     }
                 }
-                //(List<TmdInfo> tmdids, List<StuInfo> students, List<ClassListInfo> classInfo) = await TriggerStuActivity.GetStuList(client, _dingDing, classesSet.ToList(), $"{_schoolId}");
                 (List<RMember> tmdIds, List<RGroupList> classInfo) = await GroupListService.GetStutmdidListids(client, _dingDing, classesSet.ToList(), $"{_schoolId}");
                 /*var addStudentsCls = tmdIds.FindAll(x => x.type == 2);
                 var addTmdidsCls = tmdIds.FindAll(x => x.type == 1);*/
@@ -398,7 +397,6 @@ namespace TEAMModelOS.Controllers.Core
                     examData = await GetExamBySheet("private", null, $"{id}", client,  classesSet, $"{_sheetNo}");
                 }
 
-                //(List<TmdInfo> tmdids, List<StuInfo> students, List<ClassListInfo> classInfo) = await TriggerStuActivity.GetStuList(client, _dingDing, classesSet.ToList(), $"{_schoolId}");
                 (List<RMember> tmdIds, List<RGroupList> classInfo) = await GroupListService.GetStutmdidListids(client, _dingDing, classesSet.ToList(), $"{_schoolId}");
                 List<SheetConfig> configsN = new List<SheetConfig>();
                 if (examData.sheet != null) {

+ 1 - 1
TEAMModelOS/Controllers/School/GroupListController.cs

@@ -318,7 +318,7 @@ namespace TEAMModelOS.Controllers
                         {
                             string insql = string.Join(",", privateList.Select(x => $"'{x}'"));
                             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIterator<GroupListDto>(queryText: $"select distinct {SummarySql} from c where c.id in ({insql})",
-                             requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"StuList") }))
+                             requestOptions: new QueryRequestOptions() { PartitionKey = new Azure.Cosmos.PartitionKey($"GroupList") }))
                             {
                                 groupLists.Add(item);
                             }