|
@@ -482,7 +482,7 @@ namespace TEAMModelOS.Controllers
|
|
|
};
|
|
|
await _azureStorage.Save<SchoolYear>(sy);
|
|
|
}
|
|
|
- var query = $"select c.id,c.name,c.code,c.period,c.startTime,c.endTime,c.stuCount,c.type,c.progress,c.examType,c.createTime,c.source, c.subjects, c.grades,c.owner, c.scope,c.classes,c.sRate,c.lostStu,c.sStatus from c where (c.status<>404 or IS_DEFINED(c.status) = false )";
|
|
|
+ var query = $"select c.id,c.name,c.code,c.period,c.startTime,c.endTime,c.stuCount,c.type,c.progress,c.examType,c.createTime,c.source, c.subjects, c.grades,c.owner, c.scope,c.classes,c.sRate,c.lostStu,c.sStatus ,c.school from c where (c.status<>404 or IS_DEFINED(c.status) = false )";
|
|
|
if (requert.TryGetProperty("classIds", out JsonElement classIds))
|
|
|
{
|
|
|
List<string> ids = classIds.ToObject<List<string>>();
|
|
@@ -500,7 +500,7 @@ namespace TEAMModelOS.Controllers
|
|
|
strs.Add($"array_contains(c.classes,'{ssr}')");
|
|
|
}
|
|
|
string ss = string.Join(" or ", strs);
|
|
|
- query = $"select c.id,c.name,c.code,c.period,c.startTime,c.endTime,c.stuCount,c.type,c.progress,c.examType,c.createTime, c.source,c.subjects, c.grades,c.owner, c.scope,c.classes,c.sRate,c.lostStu,c.sStatus from c where ({ss}) and (c.status<>404 or IS_DEFINED(c.status) = false )";
|
|
|
+ query = $"select c.id,c.name,c.code,c.period,c.startTime,c.endTime,c.stuCount,c.type,c.progress,c.examType,c.createTime, c.source,c.subjects, c.grades,c.owner, c.scope,c.classes,c.sRate,c.lostStu,c.sStatus ,c.school from c where ({ss}) and (c.status<>404 or IS_DEFINED(c.status) = false )";
|
|
|
};
|
|
|
|
|
|
string continuationToken = string.Empty;
|