Browse Source

调整返回参数

CrazyIter_Bin 3 years ago
parent
commit
699af157ca

+ 1 - 1
TEAMModelFunction/TriggerStudy.cs

@@ -41,7 +41,7 @@ namespace TEAMModelFunction
                 //List<ChangeRecord> voteRecords = await _azureStorage.FindListByDict<ChangeRecord>(new Dictionary<string, object>() { { "RowKey", input.Id }, { "PartitionKey", vote.progress } });
                 if (study != null)
                 {
-                    (List<TmdInfo> tchList, _, _) = await TriggerStuActivity.GetTchList(client, _dingDing, study.tchLists, study.school);
+                    (List<TmdInfo> tchList,_ ) = await TriggerStuActivity.GetTchList(client, _dingDing, study.tchLists, study.school);
                     List<StuActivity> tchActivities = new List<StuActivity>();
 
                     if (tchList.IsNotEmpty())

+ 2 - 2
TEAMModelFunction/TriggerSurvey.cs

@@ -133,8 +133,8 @@ namespace TEAMModelFunction
                                     });
                                 });
                             }
-                            
-                            (List < TmdInfo > tchList, _, _) = await TriggerStuActivity.GetTchList(client, _dingDing, survey.tchLists, survey.school);
+
+                            (List<TmdInfo> tchList, _) = await TriggerStuActivity.GetTchList(client, _dingDing, survey.tchLists, survey.school);
                             if (tchList.IsNotEmpty())
                             {
                                tchList.ForEach(x => {

+ 1 - 1
TEAMModelFunction/TriggerVote.cs

@@ -140,7 +140,7 @@ namespace TEAMModelFunction
                                 });
                             }
 
-                            (List<TmdInfo> tchList, _, _) = await TriggerStuActivity.GetTchList(client, _dingDing, vote.tchLists, vote.school);
+                            (List<TmdInfo> tchList, _) = await TriggerStuActivity.GetTchList(client, _dingDing, vote.tchLists, vote.school);
                             if (tchList.IsNotEmpty())
                             {
                                 tchList.ForEach(x => {

+ 4 - 4
TEAMModelOS.SDK/Models/Service/TriggerStuActivity.cs

@@ -353,7 +353,7 @@ namespace TEAMModelOS.SDK
             }
             return (null, null, null);
         }
-        public static async Task<(List<TmdInfo> tmdinfos, List<StuInfo> students, List<ClassListInfo> classInfo)> GetTchList(CosmosClient client, DingDing _dingDing, List<string> claes, string school)
+        public static async Task<(List<TmdInfo> tmdinfos, List<ClassListInfo> classInfo)> GetTchList(CosmosClient client, DingDing _dingDing, List<string> claes, string school)
         {
             try
             {
@@ -365,7 +365,7 @@ namespace TEAMModelOS.SDK
                 List<TmdInfo> tmdinfos = new List<TmdInfo>();
                 List<string> tmdids = new List<string>();
                 List<StuInfo> stuInfos = new List<StuInfo>();
-                if (!classes.IsNotEmpty()) { return (tmdinfos, new List<StuInfo>(), null); }
+                if (!classes.IsNotEmpty()) { return (tmdinfos, null); }
                 List<string> sqlList = new List<string>();
                 classes.ForEach(x => { sqlList.Add($" '{x}' "); });
                 string sql = string.Join(" , ", sqlList);
@@ -447,13 +447,13 @@ namespace TEAMModelOS.SDK
                     classInfo.Add(classListInfo);
                 });
 
-                return (tmdinfos, stuInfos, classInfo);
+                return (tmdinfos,  classInfo);
             }
             catch (Exception ex)
             {
                 await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-OS,TriggerStuActivity-GetStuList\n{ex.Message}\n{ex.StackTrace}", GroupNames.醍摩豆服務運維群組);
             }
-            return (null, null, null);
+            return (null,  null);
         }
         public static async Task<(List<TmdInfo> tmdinfos, List<StuInfo> students,List<ClassListInfo>classInfo)> GetStuList(CosmosClient client, DingDing _dingDing, List<string> claes, string school)
         {

+ 1 - 1
TEAMModelOS/Controllers/Common/StudyController.cs

@@ -342,7 +342,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<TmdInfo> tchList, _, _) = await TriggerStuActivity.GetTchList(client, _dingDing, study.tchLists, study.school);
+                    (List<TmdInfo> tchList, _) = await TriggerStuActivity.GetTchList(client, _dingDing, study.tchLists, study.school);
                     return Ok(new { study, teachers = tchList.Select(t => t.id).ToList(), status = 200 });
                 }
                 else

+ 2 - 2
TEAMModelOS/Controllers/School/TchListController.cs

@@ -105,10 +105,10 @@ namespace TEAMModelOS.Controllers
                 List<dynamic> list = new List<dynamic>();
                 foreach (string cls in classes)
                 {
-                    (List<TmdInfo> tmdids, List<StuInfo> students, List<ClassListInfo> classLists) = await TriggerStuActivity.GetTchList(client, _dingDing, new List<string> { cls }, $"{_code}");
+                    (List<TmdInfo> tmdids,List<ClassListInfo> classLists) = await TriggerStuActivity.GetTchList(client, _dingDing, new List<string> { cls }, $"{_code}");
                     if (classLists.IsNotEmpty())
                     {
-                        list.Add(new { tmdids, students, @class = classLists.First() });
+                        list.Add(new { tmdids,  @class = classLists.First() });
                     }
                 }
                 return Ok(new { list });