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

src/biz/headteacher/growthMessageSummary.ts

@@ -41,6 +41,43 @@ export async function getClassStudents(
     if (studentAll.data.length === 0) {
         return { count: 0, dataList: [] };
     }
+
+    // 批量查询所有学生的当前匹配学期（避免 N+1 循环查询）
+    let allStudentIds = studentAll.data.map((s: any) => s.user_id);
+    let semesterMap = new Map<string, { semester_id: number; semester_name: string }>();
+    if (allStudentIds.length > 0) {
+        let allMatches = await selectDataListByParam(TABLENAME.师生匹配表, {
+            student_id: { "%in%": allStudentIds },
+            is_active: true,
+        });
+        let studentSemesterMap = new Map<string, number>();
+        let semesterIdSet = new Set<number>();
+        for (let m of allMatches.data) {
+            if (m.semester_id) {
+                studentSemesterMap.set(m.student_id, m.semester_id);
+                semesterIdSet.add(m.semester_id);
+            }
+        }
+        if (semesterIdSet.size > 0) {
+            let allSemesters = await selectDataListByParam(TABLENAME.学期表, {
+                id: { "%in%": [...semesterIdSet] },
+            });
+            let nameMap = new Map<number, string>();
+            for (let s of allSemesters.data) {
+                nameMap.set(s.id, s.name);
+            }
+            for (let [studentId, semId] of studentSemesterMap) {
+                semesterMap.set(studentId, {
+                    semester_id: semId,
+                    semester_name: nameMap.get(semId) || '',
+                });
+            }
+        }
+    }
+
+    // 当前学期
+    let currentSemester = await getCurrentSemester();
+
     for (let bean of studentAll.data) {
         let student_id = bean.user_id;
         /**获取学生基本信息 */
@@ -82,11 +119,14 @@ export async function getClassStudents(
             "%limit%": 1
         });
 
+        let semInfo = semesterMap.get(student_id);
         students.push({
             student_id: student_id,
             student_name: student.data ? student.data.user_name : '',
             gender: student.data ? student.data.gender : '',
             class_name: classInfo && classInfo.data ? classInfo.data.full_name : '',
+            semester_id: semInfo ? semInfo.semester_id : currentSemester,
+            semester_name: semInfo ? semInfo.semester_name : '',
             communication_count: communications.data || 0,
             last_communication: lastComm.data && lastComm.data.length > 0 ? {
                 date: lastComm.data[0].date,

src/biz/teacher/myStudents.ts

@@ -96,6 +96,7 @@ export async function getMyStudents(teacherId:string, studentName?:string, semes
         
         students.push({
             student_id: match.student_id,
+            semester_id: semesterId,
             student_name: student.data ? student.data.user_name : '',
             gender: student.data ? student.data.gender : '',
             class_name: classInfo && classInfo.data ? classInfo.data.full_name : '',
@@ -146,7 +147,7 @@ export async function getStudentDetail(teacherId: string, studentId: string, sem
         is_active: true
     });
     
-    if (!match.data) {
+    if (!match.data && !match.data.id) {
         throw new BizError(ERRORENUM.权限不足, '您与该学生无师生关系');
     }
     

src/biz/teacher/teacherInfo.ts

@@ -71,6 +71,7 @@ export async function teacherInfo(teacherId: string) {
  * @param param.class_ids 任教班级ID数组
  * @param param.subjects 任教科目数组
  * @param param.semester_id 学期ID（可选，默认使用当前学期）
+ * @param param.avatar 头像
  */
 export async function teacherUpdate(teacherId: string, param: any) {
 
@@ -141,6 +142,7 @@ export async function teacherUpdate(teacherId: string, param: any) {
     if (param.user_name !== undefined) userParams.user_name = param.user_name;
     if (param.user_name !== undefined) userParams.nickname = param.user_name;
     if (param.gender !== undefined) userParams.gender = param.gender;
+    if (param.avatar !== undefined) userParams.avatar = param.avatar;
 
     if (Object.keys(updateData).length > 0) {
         await updateManyData(TABLENAME.统一用户表, { user_id: teacherId }, userParams);

src/config/mysqlTableConfig.ts

@@ -41,6 +41,7 @@ export const TablesConfig = [
             eduid: { type: DataTypes.STRING(40), allowNull: true, comment: 'EduID' },
             uoid: { type: DataTypes.INTEGER, allowNull: true, defaultValue: 0, comment: '本组内排序号' },
             user_mark: { type: DataTypes.STRING(20), allowNull: true, comment: '用户标识（政务,院务,校务）' },
+            avatar: { type: DataTypes.STRING(20), allowNull: true, comment: '用户头像' },
         },
         association: []
     },

src/routers/teacher.ts

@@ -924,16 +924,17 @@ async function teacherInfo(req, res) {
 async function teacherUpdate(req, res) {
     const userInfo = req.userInfo;
     
-    let reqConf = {user_name:'String', political_status:'String', gender:'String', class_ids:'[Number]', subjects:'[String]'};
-    const NotMustHaveKeys = ['user_name', 'political_status', 'gender', 'class_ids', 'subjects'];
-    let { user_name, political_status, gender, class_ids, subjects } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
+    let reqConf = {user_name:'String', political_status:'String', gender:'String', class_ids:'[Number]', subjects:'[String]', avatar:'String'};
+    const NotMustHaveKeys = ['user_name', 'political_status', 'gender', 'class_ids', 'subjects', 'avatar'];
+    let { user_name, political_status, gender, class_ids, subjects, avatar } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
     
     let updateData = {
         political_status,
         user_name,
         gender,
         class_ids,
-        subjects
+        subjects,
+        avatar
     };
     
     let result = await teacherInfoBiz.teacherUpdate(userInfo.userId, updateData);