v0.7测试
This commit is contained in:
@@ -84,6 +84,12 @@ class ConductModel:
|
||||
end_date: str = None
|
||||
) -> List[Dict[str, Any]]:
|
||||
"""获取所有记录(班主任/班长专用)"""
|
||||
# 空字符串转为None
|
||||
if start_date == "":
|
||||
start_date = None
|
||||
if end_date == "":
|
||||
end_date = None
|
||||
|
||||
sql = """
|
||||
SELECT cr.*, s.name as student_name, s.student_no, u.real_name as recorder_name
|
||||
FROM conduct_records cr
|
||||
|
||||
@@ -34,9 +34,9 @@ class UserModel:
|
||||
async def get_by_user_id(user_id: int) -> dict:
|
||||
"""根据用户ID获取用户"""
|
||||
sql = """
|
||||
SELECT user_id, username, real_name, user_type, student_id,
|
||||
SELECT user_id, username, password_hash, real_name, user_type, student_id,
|
||||
need_change_password, status
|
||||
FROM users
|
||||
FROM users
|
||||
WHERE user_id = %s
|
||||
"""
|
||||
return await execute_one(sql, (user_id,))
|
||||
|
||||
@@ -42,7 +42,7 @@ logger = get_logger(__name__)
|
||||
async def get_students(
|
||||
request: Request,
|
||||
page: int = Query(1, ge=1),
|
||||
page_size: int = Query(20, ge=1, le=100),
|
||||
page_size: int = Query(20, ge=1, le=1000),
|
||||
search: Optional[str] = None
|
||||
):
|
||||
"""获取所有学生列表(单班级)"""
|
||||
@@ -328,7 +328,7 @@ async def get_attendance_records(
|
||||
|
||||
# ========== 管理员管理 ==========
|
||||
|
||||
@router.post("/admin/add")
|
||||
@router.post("/add")
|
||||
async def add_admin(request: Request, req: AddAdminRequest):
|
||||
"""添加管理员(班主任)"""
|
||||
user = await get_current_user(request)
|
||||
@@ -357,7 +357,7 @@ async def add_admin(request: Request, req: AddAdminRequest):
|
||||
return error_response(message=result["message"])
|
||||
|
||||
|
||||
@router.get("/admin/list")
|
||||
@router.get("/list")
|
||||
async def get_admins(request: Request):
|
||||
"""获取管理员列表(班主任)"""
|
||||
user = await get_current_user(request)
|
||||
|
||||
@@ -138,6 +138,12 @@ class ConductService:
|
||||
end_date: Optional[str] = None
|
||||
) -> Dict[str, Any]:
|
||||
"""获取历史记录"""
|
||||
# 空字符串转为None
|
||||
if start_date == "":
|
||||
start_date = None
|
||||
if end_date == "":
|
||||
end_date = None
|
||||
|
||||
role = await PermissionChecker.get_user_role(user_id)
|
||||
offset = (page - 1) * page_size
|
||||
|
||||
|
||||
Reference in New Issue
Block a user