|
@@ -532,7 +532,7 @@ namespace TEAMModelOS.Controllers.Core
|
|
|
request.TryGetProperty("scope", out JsonElement scope);
|
|
|
request.TryGetProperty("periodId", out JsonElement periodId);
|
|
|
var client = _azureCosmos.GetCosmosClient();
|
|
|
- var queryslt = $"SELECT value(c) FROM c WHERE c.type='{type}' and c.periodId='{periodId}'";
|
|
|
+ var queryslt = $"SELECT value(c) FROM c join A1 in c.periodId WHERE c.type='{type}' and A1 in ('{periodId}')";
|
|
|
if (scope.GetString().Equals("school"))
|
|
|
{
|
|
|
await foreach (var item in client.GetContainer("TEAMModelOS", "School").GetItemQueryIterator<Bloblog>(queryText: queryslt, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"Bloblog-{name}") }))
|
|
@@ -615,8 +615,8 @@ namespace TEAMModelOS.Controllers.Core
|
|
|
item.size = size != null && size.HasValue ? size.Value : 0;
|
|
|
item.time = now;
|
|
|
item.size = size != null && size.HasValue ? size.Value : 0;
|
|
|
- item.periodId = periodId.ValueKind.Equals(JsonValueKind.String) ? $"{periodId}" : "";
|
|
|
- item.subjectId = gradeId.ValueKind.Equals(JsonValueKind.Array) ? subjectId.ToObject<List<string>>() : new List<string> { "" };
|
|
|
+ item.periodId = periodId.ValueKind.Equals(JsonValueKind.Array) ? periodId.ToObject<List<string>>() : new List<string> { "" };
|
|
|
+ item.subjectId = subjectId.ValueKind.Equals(JsonValueKind.Array) ? subjectId.ToObject<List<string>>() : new List<string> { "" };
|
|
|
item.gradeId = gradeId.ValueKind.Equals(JsonValueKind.Array) ? gradeId.ToObject<List<string>>() : new List<string> { "" };
|
|
|
await client.GetContainer("TEAMModelOS", "School").ReplaceItemAsync<Bloblog>(item, item.id, new Azure.Cosmos.PartitionKey(item.code));
|
|
|
exsit = true;
|
|
@@ -628,8 +628,8 @@ namespace TEAMModelOS.Controllers.Core
|
|
|
item.size = size != null && size.HasValue ? size.Value : 0;
|
|
|
item.time = now;
|
|
|
item.size = size != null && size.HasValue ? size.Value : 0;
|
|
|
- item.periodId = periodId.ValueKind.Equals(JsonValueKind.String) ? $"{periodId}" : "";
|
|
|
- item.subjectId = gradeId.ValueKind.Equals(JsonValueKind.Array) ? subjectId.ToObject<List<string>>() : new List<string> { "" };
|
|
|
+ item.periodId = periodId.ValueKind.Equals(JsonValueKind.Array) ? periodId.ToObject<List<string>>() : new List<string> { "" };
|
|
|
+ item.subjectId = subjectId.ValueKind.Equals(JsonValueKind.Array) ? subjectId.ToObject<List<string>>() : new List<string> { "" };
|
|
|
item.gradeId = gradeId.ValueKind.Equals(JsonValueKind.Array) ? gradeId.ToObject<List<string>>() : new List<string> { "" };
|
|
|
await client.GetContainer("TEAMModelOS", "Teacher").ReplaceItemAsync<Bloblog>(item, item.id, new Azure.Cosmos.PartitionKey(item.code));
|
|
|
exsit = true;
|
|
@@ -646,8 +646,8 @@ namespace TEAMModelOS.Controllers.Core
|
|
|
url = url,
|
|
|
time = now,
|
|
|
size = size != null && size.HasValue ? size.Value : 0,
|
|
|
- periodId = periodId.ValueKind.Equals(JsonValueKind.String)?$"{periodId}":"",
|
|
|
- subjectId= gradeId.ValueKind.Equals(JsonValueKind.Array) ? subjectId.ToObject<List<string>>() : new List<string> { ""},
|
|
|
+ periodId = periodId.ValueKind.Equals(JsonValueKind.Array) ? periodId.ToObject<List<string>>() : new List<string> { "" } ,
|
|
|
+ subjectId= subjectId.ValueKind.Equals(JsonValueKind.Array) ? subjectId.ToObject<List<string>>() : new List<string> { ""},
|
|
|
gradeId = gradeId.ValueKind.Equals(JsonValueKind.Array) ? gradeId.ToObject<List<string>>() : new List<string> { "" },
|
|
|
type = u
|
|
|
};
|