|
@@ -25,8 +25,6 @@ using TEAMModelOS.SDK.Models.Cosmos.BI;
|
|
|
using TEAMModelOS.SDK.Models.Cosmos.BI.BISchool;
|
|
|
using TEAMModelOS.SDK.Models.Service.BI;
|
|
|
using TEAMModelOS.SDK.Models.Service.BIStatsWay;
|
|
|
-using static TEAMModelBI.Controllers.Census.ActivitySticsController;
|
|
|
-using static TEAMModelBI.Controllers.Census.SchoolController;
|
|
|
using LessonStats = TEAMModelOS.SDK.Models.Cosmos.BI.LessonStats;
|
|
|
|
|
|
namespace TEAMModelBI.Controllers.Census
|
|
@@ -831,17 +829,17 @@ namespace TEAMModelBI.Controllers.Census
|
|
|
scIds = schoolInfos.Select(s => s.id).ToList();
|
|
|
StringBuilder statsSql = new($"select value(c) from c where c.year={dateTime.Year}");
|
|
|
if (scIds.Count > 0)
|
|
|
- statsSql.Append($" {BICommonWay.ManyScSql("c.id", scIds, $"{dateTime.Year}-")}");
|
|
|
+ statsSql.Append($" and {BICommonWay.ManyScSql("c.id", scIds, $"{dateTime.Year}-")}");
|
|
|
|
|
|
await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryIterator<StatsInfo>(queryText: statsSql.ToString(), requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("Statistics") }))
|
|
|
{
|
|
|
statsInfos.Add(item);
|
|
|
}
|
|
|
|
|
|
- StringBuilder lastStsSql = new($"select c.lesson,c.activity from c where c.year={dateTime.Year}");
|
|
|
+ StringBuilder lastStsSql = new($"select c.lesson,c.activity from c where c.year={dateTime.Year - 1}");
|
|
|
if (scIds.Count > 0)
|
|
|
{
|
|
|
- lastStsSql.Append($" where {BICommonWay.ManyScSql("c.id", scIds, $"{dateTime.Year - 1}-")}");
|
|
|
+ lastStsSql.Append($" and {BICommonWay.ManyScSql("c.id", scIds, $"{dateTime.Year - 1}-")}");
|
|
|
}
|
|
|
|
|
|
List<LastYearLessAndAct> lastYear = new();
|