|
@@ -503,10 +503,15 @@ namespace TEAMModelOS.Controllers.Both
|
|
|
var resultBase = await client.GetContainer(Constant.TEAMModelOS, Constant.Teacher).GetList<IdNameCode>(teacherSQLBase, $"Base");
|
|
|
teachersBases = resultBase.list;
|
|
|
}
|
|
|
-
|
|
|
+ int count = 0;
|
|
|
+ if (groups.IsNotEmpty())
|
|
|
+ {
|
|
|
+ count = courseTask.schedules.RemoveAll(z => !string.IsNullOrWhiteSpace(z.groupId) && !groups.Select(v => v.id).Contains(z.groupId));
|
|
|
+ }
|
|
|
+
|
|
|
//当courseTask 为空,则matchedClasses可能会有年级匹配建议升学年的班级清单,
|
|
|
//注:比如高二可能会将高三的课程学完,则该高三的课程的学年级应该是手动处理为高中二年级。不区分学期的目的,也是可能存在提前一学期学完第二学期的课程。
|
|
|
- return Ok(new { studyYear, semesterId, courseTask, teachers= teachersBases, groups, matchedClasses = classes, matchedTeachers = teachers.Select(z => new { z.id, z.name, z.subjectIds, z.job, z.periodId, z.picture }) });
|
|
|
+ return Ok(new {count= count, studyYear, semesterId, courseTask, teachers= teachersBases, groups, matchedClasses = classes, matchedTeachers = teachers.Select(z => new { z.id, z.name, z.subjectIds, z.job, z.periodId, z.picture }) });
|
|
|
}
|
|
|
else
|
|
|
{
|