|
@@ -248,14 +248,15 @@ namespace TEAMModelBI.Controllers.Census
|
|
|
schools.Add(item);
|
|
|
}
|
|
|
|
|
|
- long exemAreaCount = 0;
|
|
|
- long surveyAreaCount = 0;
|
|
|
- long voteAreaCount = 0;
|
|
|
- long homeworkAreaCount = 0;
|
|
|
+ long exemAreaCount = 0; //评测活动
|
|
|
+ long surveyAreaCount = 0; //问卷
|
|
|
+ long voteAreaCount = 0; //投票
|
|
|
+ long homeworkAreaCount = 0; //作业活动
|
|
|
|
|
|
List<ActivityCount> activityCount = new();
|
|
|
foreach (var school in schools)
|
|
|
{
|
|
|
+
|
|
|
ActivityCount tempCount = new ActivityCount() { id = school.id, name = school.name != null ? school.name : school.id };
|
|
|
foreach (var type in types)
|
|
|
{
|
|
@@ -426,7 +427,7 @@ namespace TEAMModelBI.Controllers.Census
|
|
|
schoolLessons.Add(schoolLesson);
|
|
|
}
|
|
|
|
|
|
- return Ok(new { state = 200, schoolCount = schools.Count, countArea, weekActivity, termActivity, totalTime, appraiseArea, examAreaCount, surveyAreaCount, voteAreaCount, homeworkAreaCount, schools = schoolInfos, schoolLessons });
|
|
|
+ return Ok(new { state = 200, schoolCount = schools.Count, countArea, weekActivity, termActivity, totalTime, appraiseArea, examAreaCount, surveyAreaCount, voteAreaCount, homeworkAreaCount, major, standard, oeCount, schools = schoolInfos, schoolLessons });
|
|
|
}
|
|
|
|
|
|
/// <summary>
|