Merge remote-tracking branch 'origin/conding' into conding

PythonProject/dao/statistics_dao.py

@@ -4,43 +4,44 @@ from model.all_model import Student_Model,WlScore
 from util.database import get_db
 
 # 实现根据年龄查询学生信息的功能
-def select_age(min_age,max_age,session=Depends(get_db)):
+def select_age(min_age,max_age,db):
     try:
         if min_age is None and max_age is None:
             raise HTTPException(status_code=400, detail="请至少传入一个参数")
-        session = session.query(Student_Model)
+        db = db.query(Student_Model)
         if min_age is not None:
-            session = session.filter(Student_Model.age >= min_age,Student_Model.delete_status == 0)
+            db = db.filter(Student_Model.age >= min_age,Student_Model.delete_status == 0)
         if max_age is not None:
-            session = session.filter(Student_Model.age <= max_age,Student_Model.delete_status == 0)
-        return session.all()
+            db = db.filter(Student_Model.age <= max_age,Student_Model.delete_status == 0)
+        print('abc',db.all())
+        return db.all()
     except HTTPException:
         raise
     except Exception:
         raise HTTPException(status_code=500,detail="查询异常")
 
 # 实现统计每个班级的学员总数以及男女生的总数的功能
-def select_all(session=Depends(get_db)):
-    print('1234')
+def select_all(db):
     try:
-        l1 = session.query(Student_Model.class_id,func.count(1)).group_by(Student_Model.class_id,Student_Model.gender).all()
+        l1 = db.query(Student_Model.class_id,Student_Model.gender,func.count(1)).group_by(Student_Model.class_id,Student_Model.gender).all()
         return l1
     except Exception:
         raise HTTPException(status_code=500,detail="查询异常")
 
 # 实现根据成绩查询学员信息的功能
-def select_score(min_score,max_score,session=Depends(get_db)):
+def select_score(min_score,max_score,db):
     try:
         if min_score is None and max_score is None:
             raise HTTPException(status_code=400, detail="请至少传入一个参数")
-        session = session.query(Student_Model,WlScore.score,WlScore.score)\
+        db = db.query(Student_Model,WlScore.score,WlScore.score)\
             .join(WlScore,WlScore.stu_id == Student_Model.stu_id,WlScore.delete_status==0,WlScore.delete_status == 0)
         if min_score is not None:
-            session = session.filter(WlScore.score >= min_score)
+            db = db.filter(WlScore.score >= min_score)
         if min_score is not None:
-            session = session.filter(WlScore.score <= max_score)
-        return session.all()
+            db = db.filter(WlScore.score <= max_score)
+        return db.all()
     except HTTPException:
         raise
     except Exception:
-        raise HTTPException(status_code=500,detail="查询异常")
+        raise HTTPException(status_code=500,detail="查询异常")
+

PythonProject/dao/teacher_dao.py

@@ -3,7 +3,7 @@ from model.all_model import Teacher_Model
 from util.database import *
 from schema.teacher_schema import Teacher_RequestModel
 
-def add_teacher(req:Teacher_RequestModel,session=Depends(get_db)):
+def add_teacher(req:Teacher_RequestModel,session):
     try:
         data=req.model_dump()
         session.add(Teacher_Model(**data))
@@ -12,14 +12,14 @@ def add_teacher(req:Teacher_RequestModel,session=Depends(get_db)):
         raise HTTPException(status_code=500,detail="添加异常！")
     return req.model_dump()
 
-def select_teacher(session=Depends(get_db)):
+def select_teacher(session):
     try:
         teacher_list=session.query(Teacher_Model).filter(Teacher_Model.delete_status==0).all()
         return teacher_list
     except:
         raise HTTPException(status_code=500,detail="查询异常！")
 
-def update_teacher(id:int,req:Teacher_RequestModel,session=Depends(get_db)):
+def update_teacher(id:int,req:Teacher_RequestModel,session):
     try:
         session.query(Teacher_Model).filter(Teacher_Model.teac_id==id)\
         .filter(Teacher_Model.delete_status==0).update(req.model_dump(exclude_unset=True))
@@ -27,7 +27,7 @@ def update_teacher(id:int,req:Teacher_RequestModel,session=Depends(get_db)):
     except:
         raise HTTPException(status_code=500,detail="更新异常！")
 
-def delete_teacher(id:int,session=Depends(get_db)):
+def delete_teacher(id:int,session):
     try:
         session.query(Teacher_Model).filter(Teacher_Model.teac_id==id,Teacher_Model.delete_status==0)\
             .update({'delete_status':1})