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

PythonProject/api/employment_api.py

@@ -6,14 +6,6 @@ from util.database import get_db
 from typing import Optional
 emp_api = APIRouter(tags=['学生就业管理模块'])
 
-@emp_api.get('/employment/class/{stu_id}',response_model=EmploymentResponse,summary='获取学生就业信息')
-def get_emp_info1(stu_id: Optional[int]=Path(description='学生编号')
-                  ,db=Depends(get_db)):
-    e1 = employment_dao.get_emp_dao(stu_id=stu_id, db=db)
-    if e1:
-        return e1[0]
-    raise HTTPException(status_code=404, detail='该学生就业信息不存在')
-
 @emp_api.get('/employment/class/{class_id}',response_model=EmploymentResponse,summary='获取班级学生就业信息')
 def get_emp_info2(class_id: Optional[int]=Path(description='班级编号')
                   ,db=Depends(get_db)):

PythonProject/api/grade_api.py

@@ -19,7 +19,7 @@ def get_grade(stu_id: int,db=Depends(get_db)):
     except Exception as e:
         raise HTTPException(status_code=500,detail=f'数据库查询异常:{str(e)}')
 
-@gradeAPI.post('/grade',response_model=GradeResponse,summary='添加学生成绩')
+@gradeAPI.post('/grade',summary='添加学生成绩')
 def post_grade(o:GradeRequest,db=Depends(get_db)):
     d=o.model_dump()
     r=add_grade_dao(g=d,db=db)

PythonProject/api/statistics_api.py

@@ -40,3 +40,8 @@ def get_days(db=Depends(get_db)):
 def get_emp(db=Depends(get_db)):
     l= select_days(db)
     return l
+
+@StatisticsAPI.get('/salaries',summary='统计薪资分布')
+def get_salaries(db=Depends(get_db)):
+    s=classify_salary(db)
+    return s