v1.6版本更新

This commit is contained in:
2026-05-06 13:32:12 +08:00
parent 5c0b9c8516
commit 47be179c09
8 changed files with 115 additions and 40 deletions

View File

@@ -273,22 +273,35 @@ class ConductService:
total = total_result["total"] if total_result else 0
elif student_id:
# 管理员查看指定学生
# 普通管理员查看指定学生(仅返回自己操作的记录)
records = await ConductModel.get_student_records(
student_id=student_id,
limit=page_size,
offset=offset
offset=offset,
start_date=start_date,
end_date=end_date,
recorder_id=user_id
)
total = await ConductModel.count_student_records(
student_id=student_id,
start_date=start_date,
end_date=end_date,
recorder_id=user_id
)
total = await ConductModel.count_student_records(student_id)
else:
# 查看自己提交的记录
records = await ConductModel.get_records_by_recorder(
recorder_id=user_id,
limit=page_size,
offset=offset
offset=offset,
start_date=start_date,
end_date=end_date
)
total = await ConductModel.count_records_by_recorder(
recorder_id=user_id,
start_date=start_date,
end_date=end_date
)
total = await ConductModel.count_records_by_recorder(user_id)
return {
"records": records,