重新调整查询内容

TEAMModelOS.SDK/Models/Service/Common/ActivityStudentService.cs

@@ -348,7 +348,7 @@ namespace TEAMModelOS.SDK.Services
             int week = ((day + 7) / 7) + 1;
             return week;
         }
-        public static async Task<(List<StuActivity> datas, string continuationToken)> FindActivity(JsonElement request, string id, string school, AzureCosmosFactory _azureCosmos, AzureRedisFactory azureRedis,string ts)
+        public static async Task<(List<StuActivity> datas, string continuationToken)> FindActivity(JsonElement request, string id, string school, AzureCosmosFactory _azureCosmos, AzureRedisFactory azureRedis)
         {
 
             if (string.IsNullOrWhiteSpace(id))
@@ -400,14 +400,7 @@ namespace TEAMModelOS.SDK.Services
 
                 source = $" and  c.source = '{sc}'  ";
 
-            }
-            string tssql = "";
-            if (string.IsNullOrEmpty(ts))
-            {
-
-                tssql = $" and  c.type = '{ts}'  ";
-
-            }
+            }         
             string owner = "";
             //评测来源
             if (request.TryGetProperty("owner", out JsonElement element))
@@ -496,7 +489,7 @@ namespace TEAMModelOS.SDK.Services
                 containerId = "Student";
                 PartitionKey = $"Activity-{id}";
             }
-            string querySchool = $" SELECT distinct  value c   FROM c   {joinSqlSubjects}  where c.pk='Activity' {stimesql}  {etimesql}      {typesql}  {andSqlSubjects} {source} {owner} {name} {tssql} order by c.createTime desc";
+            string querySchool = $" SELECT distinct  value c   FROM c   {joinSqlSubjects}  where c.pk='Activity' {stimesql}  {etimesql}      {typesql}  {andSqlSubjects} {source} {owner} {name} order by c.createTime desc";
             //查询数据归属学校的
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, containerId).GetItemQueryStreamIterator(querySchool, continuationToken: continuationToken,
                 requestOptions: new QueryRequestOptions() { MaxItemCount = topcout, PartitionKey = new PartitionKey(PartitionKey) }))

TEAMModelOS/Controllers/Student/StudentCommonController.cs

@@ -56,7 +56,7 @@ namespace TEAMModelOS.Controllers
         public async Task<IActionResult> StuActivity(JsonElement request)
         {
             var (id, name, pic, school) = HttpContext.GetAuthTokenInfo();
-            (List<StuActivity> datas, string continuationToken) = await ActivityStudentService.FindActivity(request, id, school, _azureCosmos, _azureRedis, null);
+            (List<StuActivity> datas, string continuationToken) = await ActivityStudentService.FindActivity(request, id, school, _azureCosmos, _azureRedis);
             return Ok(new { datas, continuationToken });
         }
 
@@ -67,9 +67,8 @@ namespace TEAMModelOS.Controllers
         public async Task<IActionResult> StuScore(JsonElement request)
         {
             var (id, name, pic, school) = HttpContext.GetAuthTokenInfo();
-            string type = "Exam";
             //if (!HttpContext.Items.TryGetValue("Scope", out object _scope)) return BadRequest();
-            (List<StuActivity> datas, string continuationToken) = await ActivityStudentService.FindActivity(request, id, school, _azureCosmos, _azureRedis, type);
+            (List<StuActivity> datas, string continuationToken) = await ActivityStudentService.FindActivity(request, id, school, _azureCosmos, _azureRedis);
             List<(string id, string scope, string name, string source, List<string> cIds, int qamode, string createId, Dictionary<string, JsonElement> ext, long time, string owner)> eIds = new();
             //List<(string id, string scope, string name, List<string> cIds, string createId,long time)> wIds = new();
             foreach (var data in datas)
@@ -103,7 +102,7 @@ namespace TEAMModelOS.Controllers
         {
             var (id, name, pic, school) = HttpContext.GetAuthTokenInfo();
             //if (!HttpContext.Items.TryGetValue("Scope", out object _scope)) return BadRequest();
-            (List<StuActivity> datas, string continuationToken) = await ActivityStudentService.FindActivity(request, id, school, _azureCosmos, _azureRedis, "Homework");
+            (List<StuActivity> datas, string continuationToken) = await ActivityStudentService.FindActivity(request, id, school, _azureCosmos, _azureRedis);
             //List<(string id, string scope, string name, string source, List<string> cIds, int qamode, string createId, Dictionary<string, JsonElement> ext, long time, string owner)> eIds = new();
             List<(string id, string scope, string name, List<string> cIds, string createId, long time)> wIds = new();
             foreach (var data in datas)