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

PythonProject/api/statistics_api.py

@@ -6,7 +6,7 @@ from util.database import get_db
 
 StatisticsAPI = APIRouter(tags=['统计分析模块'])
 
-@StatisticsAPI.get("/age",response_model=list[StudentResponse],summary='根据年龄查询学生信息')
+@StatisticsAPI.get("/age",response_model=list[StugetResponse],summary='根据年龄查询学生信息')
 def get_students(min_age:int|None=Query(None,ge=0,le=150),max_age:int|None=Query(None,ge=0,le=150),db=Depends(get_db)):
     l = select_age(min_age,max_age,db)
     return l
@@ -45,3 +45,8 @@ def get_emp(db=Depends(get_db)):
 def get_salaries(db=Depends(get_db)):
     s=classify_salary(db)
     return s
+
+@StatisticsAPI.get('/avg_salaries',summary='统计每个班级平均薪资')
+def get_avg_salaries(db=Depends(get_db)):
+    s=avg_salary(db)
+    return s

PythonProject/api/student_api.py

@@ -19,7 +19,7 @@ def get_students(stu_id:int|None=None
                                ,page=page
                                ,page_size=page_size
                                ,db=db)
-    return StudentPageResponse(page=page,
+    return StuPageResponse(page=page,
                                page_size=page_size,
                                totals=total,
                                data=r)