|
@@ -536,10 +536,12 @@ namespace TEAMModelBI.Controllers.Census
|
|
lastYear.Add(item);
|
|
lastYear.Add(item);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- else
|
|
|
|
{
|
|
{
|
|
- statsInfo = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<StatsInfo>($"{DateTimeOffset.UtcNow.Year - 1}-{scId}'", new PartitionKey("Statistics"));
|
|
|
|
- lastYear.Add(new LastYearLessAndAct() { activity = statsInfo.activity, lesson = statsInfo.lesson });
|
|
|
|
|
|
+ scStats.id = $"{DateTimeOffset.UtcNow.Year}-{school.id}";
|
|
|
|
+ scStats.schoolId = school.id;
|
|
|
|
+ scStats.name = school.name;
|
|
|
|
+ scStats.picture = school.picture;
|
|
|
|
+ scStats.areaId = school.areaId;
|
|
}
|
|
}
|
|
|
|
|
|
DateTimeOffset dateTime = DateTimeOffset.UtcNow;
|
|
DateTimeOffset dateTime = DateTimeOffset.UtcNow;
|
|
@@ -662,8 +664,11 @@ namespace TEAMModelBI.Controllers.Census
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
- statsInfo = await cosmosClient.GetContainer(Constant.TEAMModelOS, "Common").ReadItemAsync<StatsInfo>($"{DateTimeOffset.UtcNow.Year - 1}-{scId}'", new PartitionKey("Statistics"));
|
|
|
|
- lastYear.Add(new LastYearLessAndAct() { activity = statsInfo.activity, lesson = statsInfo.lesson });
|
|
|
|
|
|
+ scStats.id = $"{DateTimeOffset.UtcNow.Year}-{school.id}";
|
|
|
|
+ scStats.schoolId = school.id;
|
|
|
|
+ scStats.name = school.name;
|
|
|
|
+ scStats.picture = school.picture;
|
|
|
|
+ scStats.areaId = school.areaId;
|
|
}
|
|
}
|
|
|
|
|
|
DateTimeOffset dateTime = DateTimeOffset.UtcNow;
|
|
DateTimeOffset dateTime = DateTimeOffset.UtcNow;
|