v2.4更新
This commit is contained in:
@@ -160,7 +160,8 @@ class ConductModel:
|
||||
end_date: str = None,
|
||||
student_id: int = None,
|
||||
include_revoked: bool = True,
|
||||
related_type: str = None
|
||||
related_type: str = None,
|
||||
reason_prefix: str = None
|
||||
) -> List[Dict[str, Any]]:
|
||||
"""获取所有记录(班主任/班长专用)"""
|
||||
# 空字符串转为None
|
||||
@@ -170,6 +171,8 @@ class ConductModel:
|
||||
end_date = None
|
||||
if related_type == "":
|
||||
related_type = None
|
||||
if reason_prefix == "":
|
||||
reason_prefix = None
|
||||
sql = """
|
||||
SELECT cr.*, s.name as student_name, s.student_no, u.real_name as recorder_name,
|
||||
ru.real_name as revoker_name
|
||||
@@ -199,6 +202,10 @@ class ConductModel:
|
||||
sql += " AND cr.related_type = %s"
|
||||
params.append(related_type)
|
||||
|
||||
if reason_prefix:
|
||||
sql += " AND cr.reason LIKE %s"
|
||||
params.append(f"{reason_prefix}%")
|
||||
|
||||
sql += " ORDER BY cr.created_at DESC LIMIT %s OFFSET %s"
|
||||
params.extend([limit, offset])
|
||||
|
||||
@@ -210,6 +217,7 @@ class ConductModel:
|
||||
start_date: str = None,
|
||||
end_date: str = None,
|
||||
related_type: str = None,
|
||||
reason_prefix: str = None,
|
||||
page: int = 1,
|
||||
page_size: int = 20
|
||||
) -> Dict[str, Any]:
|
||||
@@ -220,6 +228,8 @@ class ConductModel:
|
||||
end_date = None
|
||||
if related_type == "":
|
||||
related_type = None
|
||||
if reason_prefix == "":
|
||||
reason_prefix = None
|
||||
|
||||
conditions = ["cr.is_revoked = 0"]
|
||||
params = []
|
||||
@@ -236,6 +246,9 @@ class ConductModel:
|
||||
if related_type:
|
||||
conditions.append("cr.related_type = %s")
|
||||
params.append(related_type)
|
||||
if reason_prefix:
|
||||
conditions.append("cr.reason LIKE %s")
|
||||
params.append(f"{reason_prefix}%")
|
||||
|
||||
where_clause = " AND ".join(conditions)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user