zhouj1203@hotmail.com пре 2 година
родитељ
комит
82c5a1efa8

+ 3 - 4
TEAMModelOS.FunctionV4/CosmosDB/TriggerHomework.cs

@@ -188,10 +188,9 @@ namespace TEAMModelOS.FunctionV4
             List<string> sub = new();
             if (work.targets.Count > 0) {
                 foreach (var course in work.targets) {
-                   var info =  course.ToJsonString();
-                   var cs =  info.Split("/");
-                    if (cs.Length > 1) {
-                        sub.Add(cs[0]);
+                   var info =  course.ToObject<List<string>>();
+                    if (info.Count > 1) {
+                        sub.Add(info[0]);
                     }
                 }
             }

+ 15 - 2
TEAMModelOS.FunctionV4/CosmosDB/TriggerSurvey.cs

@@ -129,6 +129,19 @@ namespace TEAMModelOS.FunctionV4
                             List<StuActivity> stuActivities = new List<StuActivity>();
                             List<StuActivity> tmdActivities = new List<StuActivity>();
                             List<StuActivity> tchActivities = new List<StuActivity>();
+
+                            List<string> sub = new();
+                            if (survey.targets.Count > 0)
+                            {
+                                foreach (var course in survey.targets)
+                                {
+                                    var info = course.ToObject<List<string>>();
+                                    if (info.Count > 1)
+                                    {
+                                        sub.Add(info[0]);
+                                    }
+                                }
+                            }
                             if (addTmdidsCls.IsNotEmpty())
                             {
                                 addTmdidsCls.ForEach(x =>
@@ -155,7 +168,7 @@ namespace TEAMModelOS.FunctionV4
                                         scope = survey.scope,
                                         school = survey.school,
                                         creatorId = survey.creatorId,
-                                        subjects = new List<string> { "" },
+                                        subjects = sub,
                                         blob = survey.blob,
                                         owner = survey.owner,
                                         createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
@@ -190,7 +203,7 @@ namespace TEAMModelOS.FunctionV4
                                         scope = survey.scope,
                                         school = survey.school,
                                         creatorId = survey.creatorId,
-                                        subjects = new List<string> { "" },
+                                        subjects = sub,
                                         blob = survey.blob,
                                         owner = survey.owner,
                                         createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),

+ 14 - 2
TEAMModelOS.FunctionV4/CosmosDB/TriggerVote.cs

@@ -130,6 +130,18 @@ namespace TEAMModelOS.FunctionV4
                             List<StuActivity> stuActivities = new List<StuActivity>();
                             List<StuActivity> tmdActivities = new List<StuActivity>();
                             List<StuActivity> tchActivities = new List<StuActivity>();
+                            List<string> sub = new();
+                            if (vote.targets.Count > 0)
+                            {
+                                foreach (var course in vote.targets)
+                                {
+                                    var info = course.ToObject<List<string>>();
+                                    if (info.Count > 1)
+                                    {
+                                        sub.Add(info[0]);
+                                    }
+                                }
+                            }
                             if (tmds.IsNotEmpty())
                             {
                                 tmds.ForEach(x =>
@@ -156,7 +168,7 @@ namespace TEAMModelOS.FunctionV4
                                         scope = vote.scope,
                                         school = vote.school,
                                         creatorId = vote.creatorId,
-                                        subjects = new List<string> { "" },
+                                        subjects = sub,
                                         blob = null,
                                         owner = vote.owner,
                                         createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
@@ -191,7 +203,7 @@ namespace TEAMModelOS.FunctionV4
                                         scope = vote.scope,
                                         school = vote.school,
                                         creatorId = vote.creatorId,
-                                        subjects = new List<string> { "" },
+                                        subjects = sub,
                                         blob = null,
                                         owner = vote.owner,
                                         createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),