管理端-学期查询

src/biz/admin/matchManager.ts

@@ -104,7 +104,7 @@ async function checkAndCreateRemindersForMatch(studentId: string, teacherId: str
  * @param page 页码
  * @param pageSize 每页大小
  */
-export async function matchList( studentName:string, teacherName:string, matchType:string, page:number = 1, pageSize:number = 10 ) {
+export async function matchList( studentName:string, semesterId:number, teacherName:string, matchType:string, page:number = 1, pageSize:number = 10 ) {
     /**获取当前学期 */
     let semester = await getCurrentSemester();
     
@@ -136,7 +136,7 @@ export async function matchList( studentName:string, teacherName:string, matchTy
     
     // 3. 构建查询参数
     let selectParam: any = {
-        semester_id: semester.id,
+        semester_id: semesterId ?? semester.id,
         is_active: true
     };
     
@@ -200,7 +200,7 @@ export async function matchList( studentName:string, teacherName:string, matchTy
         // 获取导师任教学科
         let teacherSubjects = await selectDataListByParam(TABLENAME.教师任教科目表, {
             teacher_id: match.teacher_id,
-            semester_id: semester.id
+            semester_id: semesterId ?? semester.id
         });
         let subjects = teacherSubjects.data.map((s: any) => s.subject);
         

src/biz/admin/proceduralRecord.ts

@@ -20,12 +20,12 @@ import { formatAttachmentNameUrl, hasData } from "../../tools/system";
  * @param page 页码
  * @param pageSize 每页大小
  */
-export async function communicationList( studentName:string, teacherName:string, startDate:string, endDate:string, page:number = 1, pageSize:number = 10 ) {
+export async function communicationList( studentName:string, semesterId:number, teacherName:string, startDate:string, endDate:string, page:number = 1, pageSize:number = 10 ) {
     let semester = await getCurrentSemester();
 
     let selectParam: any = {
         main_type: COMMUNICATIONTYPE.师生交流,
-        semester_id: semester.id
+        semester_id: semesterId ?? semester.id
     };
 
     if (startDate) {
@@ -98,12 +98,12 @@ export async function communicationList( studentName:string, teacherName:string,
  * @param page 页码
  * @param pageSize 每页大小
  */
-export async function parentCommunicationList(studentName:string, teacherName:string, startDate:string, endDate:string, page:number = 1, pageSize:number = 10) {
+export async function parentCommunicationList(studentName:string, semesterId:number, teacherName:string, startDate:string, endDate:string, page:number = 1, pageSize:number = 10) {
     let semester = await getCurrentSemester();
 
     let selectParam: any = {
         main_type: COMMUNICATIONTYPE.家校沟通,
-        semester_id: semester.id
+        semester_id: semesterId ?? semester.id
     };
 
     if (startDate) {
@@ -176,9 +176,13 @@ export async function parentCommunicationList(studentName:string, teacherName:st
  * @param page 页码
  * @param pageSize 每页大小
  */
-export async function growthMessageList(studentName: string, teacherName: string, startDate: string, endDate: string, page: number = 1, pageSize: number = 10) {
+export async function growthMessageList(studentName: string, semesterId: number, teacherName: string, startDate: string, endDate: string, page: number = 1, pageSize: number = 10) {
     let semester = await getCurrentSemester();
     
+    if (semesterId) {
+        semester = await selectOneDataByParam(TABLENAME.学期表, { id: semesterId });
+    }
+    
     // 如果没有当前学期，返回空列表
     if (!semester) {
         return {
@@ -188,7 +192,7 @@ export async function growthMessageList(studentName: string, teacherName: string
     }
     
     let selectParam: any = {
-        semester_id: semester.id
+        semester_id: semesterId ?? semester.id
     };
 
     if (startDate) {
@@ -252,8 +256,13 @@ export async function growthMessageList(studentName: string, teacherName: string
  * @param page 页码
  * @param pageSize 每页大小
  */
-export async function meetingList(studentName: string, teacherName: string, startTimeStart: string, startTimeEnd: string, page: number = 1, pageSize: number = 10) {
+export async function meetingList(studentName: string, semesterId: number, teacherName: string, startTimeStart: string, startTimeEnd: string, page: number = 1, pageSize: number = 10) {
     let semester = await getCurrentSemester();
+    
+    if (semesterId) {
+        semester = await selectOneDataByParam(TABLENAME.学期表, { id: semesterId });
+    }
+    
     if (!semester) {
         return { count: 0, dataList: [] };
     }
@@ -378,11 +387,11 @@ export async function meetingList(studentName: string, teacherName: string, star
  * @param page 页码
  * @param pageSize 每页大小
  */
-export async function teacherCaseList(caseName:string, teacherName:string, startDate:string, endDate:string, page:number = 1,pageSize:number = 10) {
+export async function teacherCaseList(caseName:string, semesterId:number, teacherName:string, startDate:string, endDate:string, page:number = 1,pageSize:number = 10) {
     let semester = await getCurrentSemester();
 
     let selectParam: any = {
-        semester_id: semester.id
+        semester_id: semesterId ?? semester.id
     };
 
     if (caseName) {

src/routers/admin.ts

@@ -554,11 +554,11 @@ async function initialAssignStudents(req, res) {
 async function matchList(req, res) {
     const userInfo = req.userInfo;
     
-    let reqConf = {studentName:'String', teacherName:'String', matchType:'String', page:'Number', pageSize:'Number'};
-    const NotMustHaveKeys = ['studentName', 'teacherName', 'matchType', 'pageSize'];
-    let { studentName, teacherName, matchType, page, pageSize } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
+    let reqConf = {studentName:'String', semesterId:'Number', teacherName:'String', matchType:'String', page:'Number', pageSize:'Number'};
+    const NotMustHaveKeys = ['studentName', 'semesterId', 'teacherName', 'matchType', 'pageSize'];
+    let { studentName, semesterId, teacherName, matchType, page, pageSize } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
 
-    let result = await matchManagerBiz.matchList(studentName, teacherName, matchType, page, pageSize);
+    let result = await matchManagerBiz.matchList(studentName, semesterId, teacherName, matchType, page, pageSize);
     res.success(result);
 }
 
@@ -606,11 +606,11 @@ async function unmatchStudent(req, res) {
 async function communicationList(req, res) {
     const userInfo = req.userInfo;
     
-    let reqConf = {studentName:'String', teacherName:'String', startDate:'String', endDate:'String', page:'Number', pageSize:'Number'};
-    const NotMustHaveKeys = ['studentName', 'teacherName', 'startDate', 'endDate', 'pageSize'];
-    let { studentName, teacherName, startDate, endDate, page, pageSize } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
+    let reqConf = {studentName:'String', semesterId:'Number', teacherName:'String', startDate:'String', endDate:'String', page:'Number', pageSize:'Number'};
+    const NotMustHaveKeys = ['studentName', 'semesterId', 'teacherName', 'startDate', 'endDate', 'pageSize'];
+    let { studentName, semesterId, teacherName, startDate, endDate, page, pageSize } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
     
-    let result = await proceduralRecordBiz.communicationList(studentName, teacherName, startDate, endDate, page, pageSize);
+    let result = await proceduralRecordBiz.communicationList(studentName, semesterId, teacherName, startDate, endDate, page, pageSize);
     res.success(result);
 }
 
@@ -627,11 +627,11 @@ async function communicationList(req, res) {
 async function parentCommunicationList(req, res) {
     const userInfo = req.userInfo;
     
-    let reqConf = {studentName:'String', teacherName:'String', startDate:'String', endDate:'String', page:'Number', pageSize:'Number'};
-    const NotMustHaveKeys = ['studentName', 'teacherName', 'startDate', 'endDate', 'pageSize'];
-    let { studentName, teacherName, startDate, endDate, page, pageSize } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
+    let reqConf = {studentName:'String', semesterId:'Number', teacherName:'String', startDate:'String', endDate:'String', page:'Number', pageSize:'Number'};
+    const NotMustHaveKeys = ['studentName', 'semesterId', 'teacherName', 'startDate', 'endDate', 'pageSize'];
+    let { studentName, semesterId, teacherName, startDate, endDate, page, pageSize } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
     
-    let result = await proceduralRecordBiz.parentCommunicationList(studentName, teacherName, startDate, endDate, page, pageSize);
+    let result = await proceduralRecordBiz.parentCommunicationList(studentName, semesterId, teacherName, startDate, endDate, page, pageSize);
     res.success(result);
 }
 
@@ -648,11 +648,11 @@ async function parentCommunicationList(req, res) {
 async function growthMessageList(req, res) {
     const userInfo = req.userInfo;
     
-    let reqConf = {studentName:'String', teacherName:'String', startDate:'String', endDate:'String', page:'Number', pageSize:'Number'};
-    const NotMustHaveKeys = ['studentName', 'teacherName', 'startDate', 'endDate', 'pageSize'];
-    let { studentName, teacherName, startDate, endDate, page, pageSize } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
+    let reqConf = {studentName:'String', semesterId:'Number', teacherName:'String', startDate:'String', endDate:'String', page:'Number', pageSize:'Number'};
+    const NotMustHaveKeys = ['studentName', 'semesterId', 'teacherName', 'startDate', 'endDate', 'pageSize'];
+    let { studentName, semesterId, teacherName, startDate, endDate, page, pageSize } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
     
-    let result = await proceduralRecordBiz.growthMessageList(studentName, teacherName, startDate, endDate, page, pageSize);
+    let result = await proceduralRecordBiz.growthMessageList(studentName, semesterId, teacherName, startDate, endDate, page, pageSize);
     res.success(result);
 }
 
@@ -669,11 +669,11 @@ async function growthMessageList(req, res) {
 async function meetingList(req, res) {
     const userInfo = req.userInfo;
     
-    let reqConf = {studentName:'String', teacherName:'String', startTimeStart:'String', startTimeEnd:'String', page:'Number', pageSize:'Number'};
-    const NotMustHaveKeys = ['studentName', 'teacherName', 'startTimeStart', 'startTimeEnd', 'pageSize'];
-    let { studentName, teacherName, startTimeStart, startTimeEnd, page, pageSize } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
+    let reqConf = {studentName:'String', semesterId:'Number', teacherName:'String', startTimeStart:'String', startTimeEnd:'String', page:'Number', pageSize:'Number'};
+    const NotMustHaveKeys = ['studentName', 'semesterId', 'teacherName', 'startTimeStart', 'startTimeEnd', 'pageSize'];
+    let { studentName, semesterId, teacherName, startTimeStart, startTimeEnd, page, pageSize } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
     
-    let result = await proceduralRecordBiz.meetingList(studentName, teacherName, startTimeStart, startTimeEnd, page, pageSize);
+    let result = await proceduralRecordBiz.meetingList(studentName, semesterId, teacherName, startTimeStart, startTimeEnd, page, pageSize);
     res.success(result);
 }
 
@@ -690,11 +690,11 @@ async function meetingList(req, res) {
 async function teacherCaseList(req, res) {
     const userInfo = req.userInfo;
     
-    let reqConf = {caseName:'String', teacherName:'String', startDate:'String', endDate:'String', page:'Number', pageSize:'Number'};
-    const NotMustHaveKeys = ['caseName', 'teacherName', 'startDate', 'endDate', 'pageSize'];
-    let { caseName, teacherName, startDate, endDate, page, pageSize } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
+    let reqConf = {caseName:'String', semesterId:'Number', teacherName:'String', startDate:'String', endDate:'String', page:'Number', pageSize:'Number'};
+    const NotMustHaveKeys = ['caseName', 'semesterId', 'teacherName', 'startDate', 'endDate', 'pageSize'];
+    let { caseName, semesterId, teacherName, startDate, endDate, page, pageSize } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
     
-    let result = await proceduralRecordBiz.teacherCaseList(caseName, teacherName, startDate, endDate, page, pageSize);
+    let result = await proceduralRecordBiz.teacherCaseList(caseName, semesterId, teacherName, startDate, endDate, page, pageSize);
     res.success(result);
 }