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

PythonProject/api/employment_api.py

@@ -22,7 +22,7 @@ def get_emp_info2(class_id: Optional[int]=Path(description='班级编号')
         return e2
     raise HTTPException(status_code=404, detail='该班级就业信息不存在')
 
-@emp_api.get('/employment}',response_model=EmploymentResponse,summary='按照学⽣编号，公司名字，⼯资范围查询学⽣就业信息')
+@emp_api.get('/employment',response_model=EmploymentResponse,summary='按照学⽣编号，公司名字，⼯资范围查询学⽣就业信息')
 def get_emp_info3(stu_id:int|None = Query(None, description='学生编号')
                   ,company_name: str|None = Query(None,description='公司名称')
                   ,min_salary: float|None = Query(None,ge=0,description='最低工资')

PythonProject/api/statistics_api.py

@@ -1,6 +1,7 @@
 from fastapi import APIRouter,Depends,Query
 from dao.statistics_dao import *
 from schema.statistics_schema import *
+from schema.student_schema import *
 from util.database import get_db
 
 StatisticsAPI = APIRouter(tags=['统计分析模块'])

PythonProject/schema/statistics_schema.py

@@ -1,7 +1,5 @@
 from pydantic import BaseModel,field_serializer
 from datetime import date
-from typing import List
-from schema.student_schema import StudentResponse
 
 class AllStuResponse(BaseModel):
     all_cnt: int

PythonProject/schema/student_schema.py

@@ -40,7 +40,7 @@ class StudentResponse(BaseModel):
     progress:int
 
     @field_serializer('progress')
-    def int_to_string(cls,progress:int):
+    def int_to_string(self,progress:int):
         d1 ={
             0:'学习中',
             1:'求职中',