Merge pull request 'Conding' (#7) from conding into master

Reviewed-on: #7

PythonProject/api/employment_api.py

@@ -7,15 +7,15 @@ from typing import Optional
 emp_api = APIRouter(tags=['学生就业管理模块'])
 
 @emp_api.get('/employment/class/{class_id}',response_model=list[EmploymentResponse],summary='获取班级学生就业信息')
-def get_emp_info2(class_id: Optional[int]=Path(description='班级编号')
+def get_emp_info1(class_id: Optional[int]=Path(description='班级编号')
                   ,db=Depends(get_db)):
-    e2 = employment_dao.get_emp_dao(class_id=class_id, db=db)
-    if e2:
-        return e2
+    e1 = employment_dao.get_emp_dao(class_id=class_id, db=db)
+    if e1:
+        return e1
     raise HTTPException(status_code=404, detail='该班级就业信息不存在')
 
 @emp_api.get('/employment/students/{stu_id}',response_model=list[EmploymentResponse],summary='按照学⽣编号，公司名字，⼯资范围查询学⽣就业信息')
-def get_emp_info3(stu_id:int = Path(description='学生编号')
+def get_emp_info2(stu_id:int = Path(description='学生编号')
                   ,company_name: str|None = Query(None,description='公司名称')
                   ,min_salary: float|None = Query(None,ge=0,description='最低工资')
                   ,max_salary: float|None = Query(None,ge=0,description='最高工资')

PythonProject/api/student_api.py

@@ -52,7 +52,7 @@ def update_students(stu_id:int
         raise HTTPException(status_code=404, detail='学生不存在或已被删除，更新失败')
     return {'code':200,'totals':r,'detail':'更新成功'}
 
-@StudentAPI.delete('/students/{stu_id}',response_model= StugetResponse,summary='学生信息删除接口',description='删除学生信息')
+@StudentAPI.delete('/students/{stu_id}',response_model= StudelResponse,summary='学生信息删除接口',description='删除学生信息')
 def del_students(stu_id:int
                  ,db=Depends(get_db)):
     rows=delete_student_dao( stu_id=stu_id,db=db )

PythonProject/dao/statistics_dao.py

@@ -178,7 +178,7 @@ def classify_salary(db):
                 c+=1
             else:
                 d+=1
-        return {'5k以下': a, '5k-10k': b, '10k-15k': c, '15k': d}
+        return {'5k以下': a, '5k-10k': b, '10k-15k': c, '15k以上': d}
     except:
         raise HTTPException(status_code=500,detail='查询异常！')
 
@@ -186,11 +186,11 @@ def classify_salary(db):
 def avg_salary(db):
     try:
         l=db.query(Student_Model.class_id,func.avg(Employment_info.salary).label('avg_salaries'))\
-        .join(Employment_info,Employment_info.stu_id == Student_Model.stu_id)\
-        .filter(Employment_info.salary>0,Employment_info.delete_status==0,Student_Model.delete_status==0)\
-        .group_by(Student_Model.class_id)\
-        .order_by(func.avg(Employment_info.salary).desc()).all()
-        return l
+            .join(Employment_info,Employment_info.stu_id == Student_Model.stu_id)\
+            .filter(Employment_info.salary>0,Employment_info.delete_status==0,Student_Model.delete_status==0)\
+            .group_by(Student_Model.class_id)\
+            .order_by(func.avg(Employment_info.salary).desc()).all()
+        return [{'class_id':i[0],'avg_salaries':i[1]} for i in l]
     except:
         raise HTTPException(status_code=500,detail='统计异常！')
 

PythonProject/dao/teacher_dao.py

@@ -10,7 +10,6 @@ def add_teacher(teacher,session):
         return teacher
     except:
         session.rollback()
-        # raise HTTPException(status_code=500,detail='添加异常！')
         return None
 
 def get_teacher(id,session):

PythonProject/main.py

@@ -14,7 +14,7 @@ tags_metadata = [
     {"name": "学生就业管理模块"},
     {"name": "统计分析模块"},
 ]
-app = FastAPI(title='沃林学⽣管理系统',openapi_tags=tags_metadata)
+app = FastAPI(title='沃林学生管理系统',openapi_tags=tags_metadata)
 
 app.include_router(StudentAPI)
 

PythonProject/schema/student_schema.py

@@ -99,4 +99,10 @@ class StuPageResponse(BaseModel):
     totals: int
     data: List[StugetResponse]
 
+class StudelResponse(BaseModel):
+    code: int = 200
+    detail: str = "ok"
+    totals: int
+
+