修改活动类型查询。

TEAMModelFunction/ActivityHttpTrigger.cs

@@ -164,7 +164,7 @@ namespace TEAMModelFunction
                                 pk = "Activity",
                                 id = info.id,
                                 code = $"Activity-{x.id}",
-                                type = "exam",
+                                type = "Exam",
                                 name = info.name,
                                 startTime = info.startTime,
                                 endTime = info.endTime,
@@ -190,7 +190,7 @@ namespace TEAMModelFunction
                                 pk = "Activity",
                                 id = info.id,
                                 code = $"Activity-{info.school}-{x.id}",
-                                type = "exam",
+                                type = "Exam",
                                 name = info.name,
                                 startTime = info.startTime,
                                 endTime = info.endTime,
@@ -265,7 +265,7 @@ namespace TEAMModelFunction
                                 pk = "Activity",
                                 id = info.id,
                                 code = $"Activity-{x.id}",
-                                type = "vote",
+                                type = "Vote",
                                 name = info.name,
                                 startTime = info.startTime,
                                 endTime = info.endTime,
@@ -291,7 +291,7 @@ namespace TEAMModelFunction
                                 pk = "Activity",
                                 id = info.id,
                                 code = $"Activity-{info.school}-{x.id}",
-                                type = "vote",
+                                type = "Vote",
                                 name = info.name,
                                 startTime = info.startTime,
                                 endTime = info.endTime,
@@ -365,7 +365,7 @@ namespace TEAMModelFunction
                                 pk = "Activity",
                                 id = info.id,
                                 code = $"Activity-{x.id}",
-                                type = "survey",
+                                type = "Survey",
                                 name = info.name,
                                 startTime = info.startTime,
                                 endTime = info.endTime,
@@ -391,7 +391,7 @@ namespace TEAMModelFunction
                                 pk = "Activity",
                                 id = info.id,
                                 code = $"Activity-{info.school}-{x.id}",
-                                type = "survey",
+                                type = "Survey",
                                 name = info.name,
                                 startTime = info.startTime,
                                 endTime = info.endTime,

TEAMModelOS/Controllers/School/TeacherCommonController.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
+using TEAMModelOS.Filter;
 using TEAMModelOS.SDK.DI;
 using TEAMModelOS.SDK.Extension;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
@@ -30,12 +31,13 @@ namespace TEAMModelOS.Controllers
         }
         [ProducesDefaultResponseType]
         [HttpPost("tec-activity")]
-        // [AuthToken(Roles = "student")]
+        [AuthToken(Roles = "student,admin,teacher")]
         public async Task<IActionResult> TecActivity(JsonElement request)
         {
+            if (!request.TryGetProperty("type", out JsonElement _type)) return BadRequest();
             var (id, name, pic, school) = HttpContext.GetAuthTokenInfo();
             List<StuActivity> datas = new List<StuActivity>();
-            var queryc = $"SELECT value(c) from c where c.school = '{school}' ";
+            var queryc = $"SELECT value(c) from c where c.school = '{school}' and c.type='{_type}' ";
             await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Teacher").GetItemQueryIterator<StuActivity>(queryText: queryc, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Activity-{id}") }))
             {
                 datas.Add(item);