CrazyIter_Bin 1 年間 前
コミット
a3749e6254

+ 2 - 2
TEAMModelOS.SDK/Models/Service/GroupListService.cs

@@ -1114,14 +1114,14 @@ namespace TEAMModelOS.SDK
                 if (graduate!=-1) {
                     sql.Append($" and c.graduate={graduate} ");
                 }
-                var result = await client.GetContainer(Constant.TEAMModelOS, Constant.School).GetList<RGroupList>(sql.ToString(), $"Class-{school}");
+                var result = await client.GetContainer(Constant.TEAMModelOS, Constant.School).GetList<RGroupList>(sql.ToString(), $"Class-{school.id}");
 
                 foreach (var item in result.list)
                 {
                     GroupListDto group = new GroupListDto
                     {
                         id = item.id,
-                        code = $"GroupList-{school}",
+                        code = $"GroupList-{school.id}",
                         name = item.name,
                         periodId = item.periodId,
                         scope = "school",

+ 14 - 0
TEAMModelOS/Controllers/Common/ActivityController.cs

@@ -2118,7 +2118,21 @@ namespace TEAMModelOS.Controllers
                             if (!request.TryGetProperty("activityId", out JsonElement _activityId)) return BadRequest();
                             if (!request.TryGetProperty("uploadId", out JsonElement _uploadId)) return BadRequest();
                             if (!request.TryGetProperty("expertId", out JsonElement _expertId)) return BadRequest();
+                         //   if (!request.TryGetProperty("expertId", out JsonElement _expertId)) return BadRequest();
+                            string sql = $"select value c from c where c.upload.uploadId='{_uploadId}' and c.pk='ActivityEnroll'";
+                            var result =  await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).GetList<ActivityEnroll>(sql, $"ActivityEnroll-{_activityId}");
+                            if (result.list.IsNotEmpty())
+                            {
+                                ActivityExpert activityExpert = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemAsync<ActivityExpert>(_activityId.GetString(), new PartitionKey("ActivityExpert"));
+                                Expert expert=  activityExpert.experts.Find(z => !string.IsNullOrWhiteSpace(z.id)  &&   z.id.Equals(_expertId.GetString()));
+                                if (expert!=null) { 
+                                    
+                                }
 
+                            }
+                            else {
+                                return Ok(new { code=1,msg ="作品不存在!"});
+                            }
                             break;
                         }
                 }