1

PythonProject/dao/student_dao.py

@@ -3,7 +3,7 @@ from util.database import get_db
 from model.all_model import Student_Model
 from typing import List, Optional, Dict, Any
 
-def add_student_dao(o,db=Depends(get_db)):
+def add_student_dao(o,db):
     try:
         o1 = Student_Model( **o)
         db.add(o1)
@@ -14,7 +14,7 @@ def add_student_dao(o,db=Depends(get_db)):
         db.commit()
         return True
 
-def delete_student_dao(stu_id,db=Depends(get_db)):
+def delete_student_dao(stu_id,db):
     try:
         rows = db.query(Student_Model).filter(Student_Model.stu_id == stu_id,Student_Model.delete_status == 0)\
             .update({'delete_status':1})
@@ -25,7 +25,7 @@ def delete_student_dao(stu_id,db=Depends(get_db)):
     finally:
         return rows
 
-def update_student_dao(stu_id,update_data,db=Depends(get_db)):
+def update_student_dao(stu_id,update_data,db):
     try:
         rows = db.query( Student_Model ).filter( Student_Model.stu_id == stu_id,Student_Model.delete_status == 0).update( update_data )
     except:
@@ -40,16 +40,19 @@ def get_student_dao(stu_id:Optional[int]
                    ,class_id:Optional[int]
                    ,page: int
                    ,page_size: int
-                   ,db=Depends(get_db)
+                   ,db
                    ) -> tuple[List[Dict[str, Any]], int]:
-    q = db.query(Student_Model)
-    if stu_id:
-        q = q.filter(Student_Model.stu_id == stu_id,Student_Model.delete_status == 0)
-    if stu_name:
-        q = q.filter(Student_Model.stu_name.like(f"%{stu_name}%"),Student_Model.delete_status == 0)
-    if class_id:
-        q= q.filter(Student_Model.class_id == class_id,Student_Model.delete_status == 0)
-    total = q.count()
-    r = q.offset((page - 1) * page_size).limit(page_size).all()
-
-    return  r
+    try:
+        q = db.query(Student_Model)
+        if stu_id:
+          q = q.filter(Student_Model.stu_id == stu_id,Student_Model.delete_status == 0)
+        if stu_name and stu_name.strip() != "":
+          q = q.filter(Student_Model.stu_name.like(f"%{stu_name}%"),Student_Model.delete_status == 0)
+        if class_id:
+          q= q.filter(Student_Model.class_id == class_id,Student_Model.delete_status == 0)
+        total = q.count()
+        r = q.offset((page - 1) * page_size).limit(page_size).all()
+        return total,r
+    except:
+        db.rollback()
+        return [],0