导师/班主任端-我的学生-获取学期名称

parent 29cfa5d2
...@@ -76,7 +76,10 @@ export async function getClassStudents( ...@@ -76,7 +76,10 @@ export async function getClassStudents(
} }
// 当前学期 // 当前学期
let currentSemester = await getCurrentSemester(); let currentSemesterId = await getCurrentSemester();
let currentSemester = await selectOneDataByParam(TABLENAME.学期表, {
id: currentSemesterId
});
for (let bean of studentAll.data) { for (let bean of studentAll.data) {
let student_id = bean.user_id; let student_id = bean.user_id;
...@@ -126,7 +129,7 @@ export async function getClassStudents( ...@@ -126,7 +129,7 @@ export async function getClassStudents(
gender: student.data ? student.data.gender : '', gender: student.data ? student.data.gender : '',
class_name: classInfo && classInfo.data ? classInfo.data.full_name : '', class_name: classInfo && classInfo.data ? classInfo.data.full_name : '',
semester_id: semInfo ? semInfo.semester_id : currentSemester, semester_id: semInfo ? semInfo.semester_id : currentSemester,
semester_name: semInfo ? semInfo.semester_name : '', semester_name: semInfo ? semInfo.semester_name : currentSemester.data.name,
communication_count: communications.data || 0, communication_count: communications.data || 0,
last_communication: lastComm.data && lastComm.data.length > 0 ? { last_communication: lastComm.data && lastComm.data.length > 0 ? {
date: lastComm.data[0].date, date: lastComm.data[0].date,
......
...@@ -53,6 +53,9 @@ export async function getMyStudents(teacherId:string, studentName?:string, semes ...@@ -53,6 +53,9 @@ export async function getMyStudents(teacherId:string, studentName?:string, semes
} }
let students = []; let students = [];
let currentSemester = await selectOneDataByParam(TABLENAME.学期表, {
id: semesterId
});
for (let match of matches.data) { for (let match of matches.data) {
/**获取学生基本信息 */ /**获取学生基本信息 */
...@@ -97,6 +100,7 @@ export async function getMyStudents(teacherId:string, studentName?:string, semes ...@@ -97,6 +100,7 @@ export async function getMyStudents(teacherId:string, studentName?:string, semes
students.push({ students.push({
student_id: match.student_id, student_id: match.student_id,
semester_id: semesterId, semester_id: semesterId,
semester_name: currentSemester.data.name,
student_name: student.data ? student.data.user_name : '', student_name: student.data ? student.data.user_name : '',
gender: student.data ? student.data.gender : '', gender: student.data ? student.data.gender : '',
class_name: classInfo && classInfo.data ? classInfo.data.full_name : '', class_name: classInfo && classInfo.data ? classInfo.data.full_name : '',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment