|
@@ -229,7 +229,7 @@ namespace TEAMModelOS.Controllers
|
|
|
if (!string.IsNullOrWhiteSpace(school) && classes.IsNotEmpty())
|
|
|
{
|
|
|
//string querySchool = $" SELECT distinct value c FROM c {joinSqlClasses} {joinSqlSubjects} where {stimesql} {etimesql} {progresssql} {typesql} {andSqlSubjects} {tgSql}";
|
|
|
- string querySchool = $" SELECT distinct value c FROM c {joinSqlClasses} where {pksql} {classesSql}";
|
|
|
+ string querySchool = $" SELECT c.id,c.code, c.classes,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk FROM c {joinSqlClasses} where {pksql} {classesSql}";
|
|
|
//查询数据归属学校的
|
|
|
await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(querySchool, continuationToken: continuationTokenSchool, requestOptions: new QueryRequestOptions() { MaxItemCount = topcout, PartitionKey = new PartitionKey($"{type}-{school}") }))
|
|
|
{
|
|
@@ -260,7 +260,7 @@ namespace TEAMModelOS.Controllers
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- string queryTeacher= $" SELECT c.id,c.code, c.classes,c.subjects,c.progress,c.scope,c.startTime, FROM c where {pksql} ";
|
|
|
+ string queryTeacher= $" SELECT c.id,c.code, c.classes,c.subjects,c.progress,c.scope,c.startTime,c.school,c.creatorId,c.name,c.pk FROM c where {pksql} ";
|
|
|
//查询数据归属学校的
|
|
|
await foreach (var item in client.GetContainer("TEAMModelOS", "Common").GetItemQueryStreamIterator(queryTeacher, continuationToken: continuationTokenSchool, requestOptions: new QueryRequestOptions() { MaxItemCount = topcout, PartitionKey = new PartitionKey($"{type}-{id}") }))
|
|
|
{
|