|
@@ -888,7 +888,7 @@ namespace TEAMModelOS.Controllers
|
|
foreach (var classStud in dicClassStuds)
|
|
foreach (var classStud in dicClassStuds)
|
|
{
|
|
{
|
|
string classId = null, classNo = null, className = null, gradeId = null, periodId = null;
|
|
string classId = null, classNo = null, className = null, gradeId = null, periodId = null;
|
|
-
|
|
|
|
|
|
+ int classYear = 0;
|
|
if (classInfos.ContainsKey(classStud.Key))
|
|
if (classInfos.ContainsKey(classStud.Key))
|
|
{
|
|
{
|
|
classId = classInfos[classStud.Key].GetProperty("id").GetString();
|
|
classId = classInfos[classStud.Key].GetProperty("id").GetString();
|
|
@@ -896,6 +896,7 @@ namespace TEAMModelOS.Controllers
|
|
className = classInfos[classStud.Key].GetProperty("name").GetString();
|
|
className = classInfos[classStud.Key].GetProperty("name").GetString();
|
|
//gradeId = classInfos[classStud.Key].GetProperty("gradeId").GetString();
|
|
//gradeId = classInfos[classStud.Key].GetProperty("gradeId").GetString();
|
|
periodId = classInfos[classStud.Key].GetProperty("periodId").GetString();
|
|
periodId = classInfos[classStud.Key].GetProperty("periodId").GetString();
|
|
|
|
+ classYear = classInfos[classStud.Key].GetProperty("year").GetInt32();
|
|
}
|
|
}
|
|
|
|
|
|
var tmp = classStud.Value.Select(o =>
|
|
var tmp = classStud.Value.Select(o =>
|
|
@@ -910,7 +911,9 @@ namespace TEAMModelOS.Controllers
|
|
classNo,
|
|
classNo,
|
|
className,
|
|
className,
|
|
gradeId,
|
|
gradeId,
|
|
- periodId
|
|
|
|
|
|
+ periodId,
|
|
|
|
+ classYear
|
|
|
|
+
|
|
});
|
|
});
|
|
ret.AddRange(tmp);
|
|
ret.AddRange(tmp);
|
|
}
|
|
}
|
|
@@ -928,7 +931,8 @@ namespace TEAMModelOS.Controllers
|
|
classNo = (string)null,
|
|
classNo = (string)null,
|
|
className = (string)null,
|
|
className = (string)null,
|
|
gradeId = (string)null,
|
|
gradeId = (string)null,
|
|
- periodId = (string)null
|
|
|
|
|
|
+ periodId = (string)null,
|
|
|
|
+ classYear = -1
|
|
}));
|
|
}));
|
|
|
|
|
|
return ret;
|
|
return ret;
|