Browse Source

增加classes字段

CrazyIter_Bin 3 years ago
parent
commit
1bbadab7aa

+ 12 - 6
TEAMModelFunction/ActivityHttpTrigger.cs

@@ -175,7 +175,8 @@ namespace TEAMModelFunction
                                 blob = null,
                                 owner = info.owner,
                                 createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
-                                taskStatus = -1
+                                taskStatus = -1,
+                                classIds = classes
 
                             });
                         });
@@ -200,7 +201,8 @@ namespace TEAMModelFunction
                                 blob=null,
                                 owner = info.owner,
                                 createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
-                                taskStatus = -1
+                                taskStatus = -1,
+                                classIds = classes
                             });
                         });
                     }
@@ -274,7 +276,8 @@ namespace TEAMModelFunction
                                 blob = null,
                                 owner = info.owner,
                                 createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
-                                taskStatus = -1
+                                taskStatus = -1,
+                                classIds = classes
 
                             });
                         });
@@ -299,7 +302,8 @@ namespace TEAMModelFunction
                                 blob = null,
                                 owner = info.owner,
                                 createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
-                                taskStatus = -1
+                                taskStatus = -1,
+                                classIds = classes
                             });
                         });
                     }
@@ -372,7 +376,8 @@ namespace TEAMModelFunction
                                 blob = info.blob,
                                 owner=info.owner,
                                 createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
-                                taskStatus = -1
+                                taskStatus = -1,
+                                classIds = classes
 
                             });
                         });
@@ -397,7 +402,8 @@ namespace TEAMModelFunction
                                 blob=info.blob,
                                 owner = info.owner,
                                 createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
-                                taskStatus = -1
+                                taskStatus = -1,
+                                classIds = classes
                             });
                         });
                     }

+ 4 - 3
TEAMModelFunction/TriggerSurvey.cs

@@ -101,8 +101,8 @@ namespace TEAMModelFunction
                                         blob = survey.blob,
                                         owner = survey.owner,
                                         createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
-                                        taskStatus = -1
-
+                                        taskStatus = -1,
+                                        classIds=classes
                                     });
                                 });
                             }
@@ -126,7 +126,8 @@ namespace TEAMModelFunction
                                         blob = survey.blob,
                                         owner = survey.owner,
                                         createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
-                                        taskStatus = -1
+                                        taskStatus = -1,
+                                        classIds = classes
                                     });
                                 });
                             }

+ 4 - 2
TEAMModelFunction/TriggerVote.cs

@@ -107,7 +107,8 @@ namespace TEAMModelFunction
                                         blob = null,
                                         owner = vote.owner,
                                         createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
-                                        taskStatus = -1
+                                        taskStatus = -1,
+                                        classIds = classes
                                     });
                                 });
                             }
@@ -131,7 +132,8 @@ namespace TEAMModelFunction
                                         blob = null,
                                         owner = vote.owner,
                                         createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
-                                        taskStatus = -1
+                                        taskStatus = -1,
+                                        classIds = classes
                                     });
                                 });
                             }

+ 6 - 2
TEAMModelOS.SDK/Models/Service/StuListService.cs

@@ -10,6 +10,7 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelFunction
 {
@@ -65,6 +66,7 @@ namespace TEAMModelFunction
                     {
                         continue;
                     }
+                    List<string> classes = ExamService.getClasses(activity.classes, activity.stuLists);
                     //学生新加入名单的
                     foreach (Students students in stuListChange.stujoin)
                     {
@@ -85,7 +87,8 @@ namespace TEAMModelFunction
                             blob = activity.blob,
                             owner = activity.owner,
                             createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
-                            taskStatus = -1
+                            taskStatus = -1,
+                            classIds = classes
                         };
                         await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StuListService-FixActivity\n名单发生变更 新建活动中间表\n{stucourse.ToJsonString()}", GroupNames.醍摩豆服務運維群組);
                         await client.GetContainer("TEAMModelOS", "Student").UpsertItemAsync(stucourse, new PartitionKey(stucourse.code));
@@ -109,7 +112,8 @@ namespace TEAMModelFunction
                             blob = activity.blob,
                             owner = activity.owner,
                             createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
-                            taskStatus = -1
+                            taskStatus = -1,
+                            classIds = classes
                         }; 
                         await _dingDing.SendBotMsg($"{Environment.GetEnvironmentVariable("Option:Location")}-StuListService-FixActivity\n名单发生变更 新建活动中间表\n{stucourse.ToJsonString()}", GroupNames.醍摩豆服務運維群組);
                         await client.GetContainer("TEAMModelOS", "Teacher").UpsertItemAsync(stucourse, new PartitionKey(stucourse.code));

+ 7 - 3
TEAMModelOS.SDK/Models/Service/TriggerStuActivity.cs

@@ -12,6 +12,7 @@ using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
+using TEAMModelOS.SDK.Models.Service;
 
 namespace TEAMModelFunction
 {
@@ -31,7 +32,8 @@ namespace TEAMModelFunction
             }
             if (activity != null)
             {
-                (List<TmdInfo> tmdids, List<StuInfo> students,List<ClassListInfo> classLists) = await GetStuList(client, _dingDing, activity.classes, activity.school);
+                List<string> classes = ExamService.getClasses(activity.classes, activity.stuLists);
+                (List<TmdInfo> tmdids, List<StuInfo> students,List<ClassListInfo> classLists) = await GetStuList(client, _dingDing, classes, activity.school);
                 if (tmdids.IsNotEmpty())
                 {
                     foreach (TmdInfo tmdid in tmdids)
@@ -53,7 +55,8 @@ namespace TEAMModelFunction
                             blob = activity.blob,
                             owner = activity.owner,
                             createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
-                            taskStatus = -1
+                            taskStatus = -1,
+                            classIds = classes
                         };
                         await client.GetContainer("TEAMModelOS", "Teacher").UpsertItemAsync(stucourse, new PartitionKey(stucourse.code));
                     }
@@ -79,7 +82,8 @@ namespace TEAMModelFunction
                             blob = activity.blob,
                             owner = activity.owner,
                             createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
-                            taskStatus = -1
+                            taskStatus = -1,
+                            classIds = classes
                         };
                         await client.GetContainer("TEAMModelOS", "Student").UpsertItemAsync(stucourse, new PartitionKey(stucourse.code));
                     }