学生端-导师评价列表分页

parent 0ec2cabf
......@@ -29,8 +29,8 @@ export async function getSurveyList(param: { surveyName?: string; status?: numbe
let tableModel = mysqlModelMap[TABLENAME.测评活动表];
// 构建 WHERE 条件
let where: any = {};
// 构建 WHERE 条件,固定只查模板
let where: any = { is_temp: true };
if (surveyName) {
where.name = { [Op.like]: `%${surveyName}%` };
}
......
......@@ -293,11 +293,11 @@ export async function getInteractionDynamic(studentId: string) {
* @param surveyName 测评标题(可选,模糊搜索)
* @param status 测评状态(可选,0=待测评 1=已测评)
*/
export async function getTeacherSurvey(studentId: string, surveyName?: string, status?: number) {
export async function getTeacherSurvey(studentId: string, surveyName?: string, status?: number, page: number = 1, pageSize: number = 10) {
/**获取当前学期 */
let semester = await getCurrentSemester();
if (!semester) {
return [];
return { count: 0, dataList: [] };
}
/**查当前学生的导师 */
......@@ -307,7 +307,7 @@ export async function getTeacherSurvey(studentId: string, surveyName?: string, s
is_active: true
});
if (!match.data) {
return [];
return { count: 0, dataList: [] };
}
/**查测评活动列表 */
......@@ -318,7 +318,7 @@ export async function getTeacherSurvey(studentId: string, surveyName?: string, s
};
let surveyList = await selectDataListByParam(TABLENAME.测评活动表, surveyParam);
if (!surveyList.data || surveyList.data.length === 0) {
return [];
return { count: 0, dataList: [] };
}
let resultList = [];
......@@ -359,7 +359,17 @@ export async function getTeacherSurvey(studentId: string, surveyName?: string, s
});
}
return resultList;
/**手动分页(因为筛选后数据可能变化) */
let total = resultList.length;
let start = (page - 1) * pageSize;
let end = start + pageSize;
let dataList = resultList.slice(start, end);
/**统一返回格式:count 和 dataList(参考 teacherManager.ts) */
return {
count: total,
dataList: dataList
};
}
......
......@@ -181,12 +181,12 @@ async function getInteractionDynamic(req, res) {
async function getTeacherSurvey(req, res) {
const userInfo = req.userInfo;
let reqConf = {surveyName:'String', status: "Number"};
const NotMustHaveKeys = ['surveyName', 'status'];
let { surveyName, status } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
let reqConf = {surveyName:'String', status: "Number", page: "Number", pageSize: "Number"};
const NotMustHaveKeys = ['surveyName', 'status', 'page', 'pageSize'];
let { surveyName, status, page, pageSize } = eccReqParamater(reqConf, req.body, NotMustHaveKeys);
let result = await myTeacherBiz.getTeacherSurvey(userInfo.userId, surveyName, status);
res.success({ dataList: result });
let result = await myTeacherBiz.getTeacherSurvey(userInfo.userId, surveyName, status, page, pageSize);
res.success(result);
}
/**
* 测评详情
......
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