diff --git a/PythonProject/api/employment_api.py b/PythonProject/api/employment_api.py
index 68cc125..22095c7 100644
--- a/PythonProject/api/employment_api.py
+++ b/PythonProject/api/employment_api.py
@@ -1,30 +1,29 @@
-from fastapi import FastAPI,APIRouter,Depends,HTTPException
+from fastapi import APIRouter,Depends,HTTPException
 
 from dao import employment_dao
 from dao.employment_dao import get_employment_dao
-from schema.employment_schema import EmlpoymentRequest,EmploymentResponse
+from schema.employment_schema import EmploymentRequest,EmploymentResponse
 from model.all_model import ClassManagement,Employment_info
 from util.database import get_db
 
-app = FastAPI()
-@app.get('employment/students/{stu_id}',response_model=EmploymentResponse,summary='获取学生就业信息')
+emp_api = APIRouter()
+@emp_api.get('employment/students/{stu_id}',response_model=EmploymentResponse,summary='获取学生就业信息')
 def get_emp_info1(stu_id: int,db=Depends(get_db)):
     try:
         if stu_id:
             return employment_dao.get_employment_info()
     except:
-        raise HTTPException(status_code=404, detail='就业信息不存在')
+        raise HTTPException(status_code=404, detail='该学生就业信息不存在')
 
-@app.get('employment/class/{class_id}',summary='获取班级学生就业信息')
+@emp_api.get('employment/class/{class_id}',summary='获取班级学生就业信息')
 def get_emp_info2(class_id: int,db=Depends(get_db)):
     try:
         if class_id:
             return employment_dao.get_employment_info()
     except:
-        raise HTTPException(status_code=404, detail='就业信息不存在')
-
-
-
-@app.post('employment/students/{stu_id}')
-def create_emp_info(stu_id: int,db=Depends(get_db)):
+        raise HTTPException(status_code=404, detail='该班级就业信息不存在')
 
+# @emp_api.post('employment/students/{stu_id}')
+# def create_emp_info(stu_id: int,db=Depends(get_db)):
+#     try:
+#     pass
diff --git a/PythonProject/api/grade_api.py b/PythonProject/api/grade_api.py
index c0a33f0..5872b26 100644
--- a/PythonProject/api/grade_api.py
+++ b/PythonProject/api/grade_api.py
@@ -16,6 +16,11 @@ def get_grade(stu_id: int,db=Depends(get_db)):
 
 @gradeAPI.post('/{stu_id}',response_model=GradeResponse,summary='添加学生成绩')
 def post_grade(o:GradeRequest=Form(),db=Depends(get_db)):
+
+    exist_obj = get_grade_dao(db,o.stu_id)
+    if exist_obj:
+        raise HTTPException(status_code=409, detail="该学生此考核序次成绩已存在！")
+
     d=o.model_dump()
     r=add_grade_dao(g=d,db=db)
     if not r:
diff --git a/PythonProject/api/statistics_api.py b/PythonProject/api/statistics_api.py
index aff954a..f934c21 100644
--- a/PythonProject/api/statistics_api.py
+++ b/PythonProject/api/statistics_api.py
@@ -1,21 +1,37 @@
 from fastapi import APIRouter,Depends
-from dao.statistics_dao import select_all,select_age,select_score
+from dao.statistics_dao import select_all,select_age,select_score,select_avg_score,select_salary,select_days
 from schema.student_schema import StudentResponse
+from schema.statistics_schema import AllStuResponse,AvgDayResponse,AcgScoreResponse
 from util.database import get_db
 
 StatisticsAPI = APIRouter()
 
-@StatisticsAPI.get("/age",response_model=list[StudentResponse],tags=['统计分析模块'],description='根据年龄查询学生信息')
+@StatisticsAPI.get("/age",response_model=list[StudentResponse],tags=['统计分析模块'],summary='根据年龄查询学生信息')
 def get_students(min_age:int|None=None,max_age:int|None=None,db=Depends(get_db)):
     l = select_age(min_age,max_age,db)
     return l
 
-@StatisticsAPI.get("/all",response_model=StudentResponse,tags=['统计分析模块'],description='统计每个班级的学员总数和男女生总数')
+@StatisticsAPI.get("/all",response_model=list[AllStuResponse],tags=['统计分析模块'],summary='统计每个班级的学员总数和男女生总数')
 def get_students(db=Depends(get_db)):
     l = select_all(db)
-    return [i for i in l]
+    return l
 
-@StatisticsAPI.get("/score",response_model=StudentResponse,tags=['统计分析模块'],description='根据成绩查询学生信息')
+@StatisticsAPI.get("/score",response_model=StudentResponse,tags=['统计分析模块'],summary='根据成绩查询学生信息')
 def get_students(min_score:int|None=None,max_score:int|None=None,db=Depends(get_db)):
     l = select_score(min_score,max_score,db)
     return [i for i in l]
+
+@StatisticsAPI.get("/avg_score",response_model=list[AcgScoreResponse],tags=['统计分析模块'],summary='统计每次考试每个班级的平均分并排序')
+def get_scores(db=Depends(get_db)):
+    l = select_avg_score(db)
+    return l
+
+@StatisticsAPI.get("/salary",response_model=list[StudentResponse],tags=['统计分析模块'],summary='统计薪资最高的前五名的学员信息')
+def get_scores(db=Depends(get_db)):
+    l = select_salary(db)
+    return l
+
+@StatisticsAPI.get("/avg_day",response_model=list[AvgDayResponse],tags=['统计分析模块'],summary='统计每个班级的平均就业时长')
+def get_days(db=Depends(get_db)):
+    l = select_days(db)
+    return l
diff --git a/PythonProject/api/student_api.py b/PythonProject/api/student_api.py
index 90bbc0c..050991a 100644
--- a/PythonProject/api/student_api.py
+++ b/PythonProject/api/student_api.py
@@ -1,28 +1,41 @@
 from fastapi import APIRouter,Depends,HTTPException
-from dao.student_dao import delete_student_dao,add_student_dao,update_student_dao,get_student_dao
-from schema.student_schema import StudentRequest,StudentResponse,StugetResponse
+from dao.student_dao import *
+from schema.student_schema import *
 from util.database import get_db
 
 
 StudentAPI = APIRouter()
 
-@StudentAPI.get('/',tags=['学⽣基本信息管理模块'],description='查询学生信息')
+@StudentAPI.get('/',response_model=list[StudentPageResponse],tags=['学⽣基本信息管理模块'],description='查询学生信息')
 def get_students(stu_id:int|None=None
                 ,stu_name:str|None=None
                 ,class_id:int|None=None
                 ,db=Depends(get_db)
                 ,page:int=1
                 ,page_size:int=10):
-    r=get_student_dao(stu_id,stu_name,class_id,db,page,page_size)
-    if r:
-        return r
-    raise HTTPException(status_code=404,detail='学生不存在')
+    r, total = get_student_dao(stu_id=stu_id
+                               ,stu_name=stu_name
+                               ,class_id=class_id
+                               ,page=page
+                               ,page_size=page_size
+                               ,db=db)
+
+    if not r:
+          raise HTTPException(status_code=404,detail='学生不存在')
+    return {'code': 200
+        , 'detail': 'ok'
+        , 'page': page
+        , 'page_size': page_size
+        , 'total': total
+        , 'data': r}
 
 @StudentAPI.put('/{stu_id}',tags=['学⽣基本信息管理模块'])
 def update_students(s:StudentRequest
                     ,stu_id:int
                     ,db=Depends(get_db)):
     d = s.model_dump(exclude_unset=True)
+    if not d:
+        raise HTTPException(status_code=400, detail='更新内容不能为空！')
     r = update_student_dao( stu_id=stu_id,update_data=d,db=db )
     if not r:
         raise HTTPException(status_code=500, detail='没有更新！')
@@ -36,13 +49,14 @@ def del_students(stu_id:int
         raise HTTPException(status_code=500,detail='没有删除')
     return {'code':200,'totals':rows,'detail':'删除成功'}
 
-@StudentAPI.post('/',tags=['学⽣基本信息管理模块'],response_model=list[StugetResponse])
+@StudentAPI.post('/',tags=['学⽣基本信息管理模块'],response_model=StugetResponse)
 def add_students(s:StudentRequest
                  ,db=Depends(get_db)):
-    d=s.model_dump(exclude_unset=True)
-    r=add_student_dao(o=d,db=db)
-    if not r:
+    d=s.model_dump(exclude_unset=False)
+    stu_new=add_student_dao(o=d,db=db)
+    if not stu_new:
         raise HTTPException(status_code=500,detail='添加失败')
+    return stu_new
 
 
 @StudentAPI.put('/',tags=['学⽣基本信息管理模块'])
diff --git a/PythonProject/dao/employment_dao.py b/PythonProject/dao/employment_dao.py
index 47275fb..426452b 100644
--- a/PythonProject/dao/employment_dao.py
+++ b/PythonProject/dao/employment_dao.py
@@ -1,40 +1,46 @@
-
+from fastapi import HTTPException,Depends
 from model.all_model import Employment_info, ClassManagement, Student_Model
 from util.database import get_db
-from schema.employment_schema import EmlpoymentRequest
+from schema.employment_schema import EmploymentRequest
 
-def get_employment_dao(stu_id,class_id,db):
-    q = db.query(Employment_info).\
-        join(ClassManagement,ClassManagement.stu_id == Employment_info.stu_id).\
-        filter(Employment_info.delete_status == 0).\
-        filter(Student_Model.delete_status == 0).\
-        filter(ClassManagement.delete_status == 0)
-    if stu_id is not None:
-        q = q.filter(Employment_info.stu_id == stu_id)
-    if class_id is not None:
-        q = q.filter(ClassManagement.class_id == class_id)
-    r = q.all()
-    if r:
-        return [{'emp_id':i.emp_id
-                ,'stu_id': i.stu_id
-                ,'stu_name':i.stu_name
-                ,'class_id':i.class_id
-                ,'email':i.email
-                ,'employment_opening_date':i.employment_opening_date
-                ,'offer_issuance_date':i.offer_issuance_date
-                ,'company_name':i.company_name
-                ,'company_address':i.company_address
-                ,'salary':i.salary
-                }for i in r
-                ]
-
-def add_employment_dao(e:EmlpoymentRequest,db,stu_id):
+def get_employment_dao(stu_id,class_id,db=Depends(get_db())):
     try:
-        e1 = Employment_info(**e)
-        db.add(e1)
+        q = db.query(Employment_info).\
+            join(Student_Model,Employment_info.stu_id == Student_Model.stu_id).\
+            join(ClassManagement,Student_Model.class_id == ClassManagement.class_id).\
+            filter(Employment_info.delete_status == 0).\
+            filter(Student_Model.delete_status == 0).\
+            filter(ClassManagement.delete_status == 0)
+        if stu_id is not None:
+            q = q.filter(Employment_info.stu_id == stu_id)
+        if class_id is not None:
+            q = q.filter(ClassManagement.class_id == class_id)
+        r = q.all()
+        if r:
+            return [{'emp_id':i.emp_id
+                    ,'stu_id': i.stu_id
+                    ,'stu_name':i.stu_name
+                    ,'class_id':i.class_id
+                    ,'email':i.email
+                    ,'employment_opening_date':i.employment_opening_date
+                    ,'offer_issuance_date':i.offer_issuance_date
+                    ,'company_name':i.company_name
+                    ,'company_address':i.company_address
+                    ,'salary':i.salary
+                    }for i in r
+                    ]
     except:
-        db.rollback()
-        return False
-    else:
-        db.commit()
-        return True
+        raise HTTPException(status_code=404,detail='信息不存在！')
+
+# def add_employment_dao(e:EmlpoymentRequest,db=Depends(get_db()),stu_id):
+#     try:
+#         r = db.query(Employment_info).filter(Employment_info.stu_id == stu_id).all()
+#         if r:
+#         e1 = Employment_info(**e)
+#         db.add(e1)
+#     except:
+#         db.rollback()
+#         return False
+#     else:
+#         db.commit()
+#         return True
diff --git a/PythonProject/dao/statistics_dao.py b/PythonProject/dao/statistics_dao.py
index 249e6d1..52658c8 100644
--- a/PythonProject/dao/statistics_dao.py
+++ b/PythonProject/dao/statistics_dao.py
@@ -1,7 +1,6 @@
-from fastapi import HTTPException,Depends
+from fastapi import HTTPException
 from sqlalchemy import func
-from model.all_model import Student_Model,WlScore
-from util.database import get_db
+from model.all_model import Student_Model,WlScore,Employment_info
 
 # 实现根据年龄查询学生信息的功能
 def select_age(min_age,max_age,db):
@@ -23,7 +22,8 @@ def select_age(min_age,max_age,db):
 # 实现统计每个班级的学员总数以及男女生的总数的功能
 def select_all(db):
     try:
-        l1 = db.query(Student_Model.class_id,Student_Model.gender,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).label('cnt'))\
+            .group_by(Student_Model.class_id,Student_Model.gender).all()
         return l1
     except Exception:
         raise HTTPException(status_code=500,detail="查询异常")
@@ -34,7 +34,8 @@ def select_score(min_score,max_score,db):
         if min_score is None and max_score is None:
             raise HTTPException(status_code=400, detail="请至少传入一个参数")
         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)
+                .join(WlScore,WlScore.stu_id == Student_Model.stu_id)\
+                .filter(WlScore.delete_status==0,Student_Model.delete_status == 0)
         if min_score is not None:
             db = db.filter(WlScore.score >= min_score)
         if min_score is not None:
@@ -45,3 +46,48 @@ def select_score(min_score,max_score,db):
     except Exception:
         raise HTTPException(status_code=500,detail="查询异常")
 
+# 实现统计每次考试每个班级的平均分并排序的功能
+def select_avg_score(db):
+    try:
+        l1 = db.query(Student_Model.class_id,func.avg(WlScore.score).label('avg_score'))\
+            .join(Student_Model,WlScore.stu_id == Student_Model.stu_id)\
+            .filter(WlScore.delete_status==0,Student_Model.delete_status == 0)\
+            .group_by(Student_Model.class_id)\
+            .order_by(func.avg(WlScore.score)).all()
+        return l1
+    except Exception:
+        raise HTTPException(status_code=500,detail="查询异常")
+
+# 实现统计薪资最高的前五名的学员信息
+def select_salary(db):
+    try:
+        l1 = db.query(Student_Model,Employment_info.salary)\
+            .join(Employment_info,Employment_info.stu_id==Student_Model.stu_id)\
+            .filter(Employment_info.delete_status==0,Student_Model.delete_status == 0)\
+            .order_by(Employment_info.salary.desc())\
+            .limit(5).all()
+        return l1
+    except Exception:
+        raise HTTPException(status_code=500,detail="查询异常")
+
+# 实现统计每个班级的平均就业时长
+def select_days(db):
+    try:
+        l1 = db.query(Student_Model.class_id,
+            func.coalesce(
+                func.avg(
+                    func.datediff(
+                        Employment_info.offer_issuance_date, Employment_info.employment_opening_date
+                    )
+                ),0).label("avg_days")
+            ).join(Employment_info,Employment_info.stu_id == Student_Model.stu_id)\
+            .filter(Student_Model.delete_status == 0,
+                    Employment_info.delete_status == 0,
+                    Employment_info.employment_opening_date.isnot(None),
+                    Employment_info.offer_issuance_date.isnot(None),)\
+            .group_by( Student_Model.class_id)\
+            .order_by(func.avg(func.datediff(Employment_info.offer_issuance_date,Student_Model.admission_date)).desc()).all()
+        return l1
+    except Exception:
+        raise HTTPException(status_code=500, detail="查询异常")
+
diff --git a/PythonProject/dao/student_dao.py b/PythonProject/dao/student_dao.py
index 5cd585e..e896579 100644
--- a/PythonProject/dao/student_dao.py
+++ b/PythonProject/dao/student_dao.py
@@ -3,7 +3,7 @@ from util.database import get_db
 from model.all_model import Student_Model
 from typing import List, Optional, Dict, Any
 
-def add_student_dao(o,db=Depends(get_db)):
+def add_student_dao(o,db):
     try:
         o1 = Student_Model( **o)
         db.add(o1)
@@ -14,7 +14,7 @@ def add_student_dao(o,db=Depends(get_db)):
         db.commit()
         return True
 
-def delete_student_dao(stu_id,db=Depends(get_db)):
+def delete_student_dao(stu_id,db):
     try:
         rows = db.query(Student_Model).filter(Student_Model.stu_id == stu_id,Student_Model.delete_status == 0)\
             .update({'delete_status':1})
@@ -25,7 +25,7 @@ def delete_student_dao(stu_id,db=Depends(get_db)):
     finally:
         return rows
 
-def update_student_dao(stu_id,update_data,db=Depends(get_db)):
+def update_student_dao(stu_id,update_data,db):
     try:
         rows = db.query( Student_Model ).filter( Student_Model.stu_id == stu_id,Student_Model.delete_status == 0).update( update_data )
     except:
@@ -40,16 +40,19 @@ def get_student_dao(stu_id:Optional[int]
                    ,class_id:Optional[int]
                    ,page: int
                    ,page_size: int
-                   ,db=Depends(get_db)
+                   ,db
                    ) -> tuple[List[Dict[str, Any]], int]:
-    q = db.query(Student_Model)
-    if stu_id:
-        q = q.filter(Student_Model.stu_id == stu_id,Student_Model.delete_status == 0)
-    if stu_name:
-        q = q.filter(Student_Model.stu_name.like(f"%{stu_name}%"),Student_Model.delete_status == 0)
-    if class_id:
-        q= q.filter(Student_Model.class_id == class_id,Student_Model.delete_status == 0)
-    total = q.count()
-    r = q.offset((page - 1) * page_size).limit(page_size).all()
-
-    return  r
+    try:
+        q = db.query(Student_Model)
+        if stu_id:
+          q = q.filter(Student_Model.stu_id == stu_id,Student_Model.delete_status == 0)
+        if stu_name and stu_name.strip() != "":
+          q = q.filter(Student_Model.stu_name.like(f"%{stu_name}%"),Student_Model.delete_status == 0)
+        if class_id:
+          q= q.filter(Student_Model.class_id == class_id,Student_Model.delete_status == 0)
+        total = q.count()
+        r = q.offset((page - 1) * page_size).limit(page_size).all()
+        return total,r
+    except:
+        db.rollback()
+        return [],0
diff --git a/PythonProject/main.py b/PythonProject/main.py
index b2aef0b..c944c14 100644
--- a/PythonProject/main.py
+++ b/PythonProject/main.py
@@ -1,17 +1,14 @@
 from fastapi import FastAPI
+from api.employment_api import emp_api
 from api.student_api import StudentAPI
 from api.statistics_api import StatisticsAPI
 from api.teacher_api import teacher_api
 from api.grade_api import gradeAPI
-app = FastAPI()
+app = FastAPI(title='沃林学⽣管理系统')
 
 app.include_router(StudentAPI)
 app.include_router(StatisticsAPI)
-
 app.include_router(teacher_api)
-
-
-if __name__ == '__main__':
-    import uvicorn
-    uvicorn.run("main:app",host='0.0.0.0',port=12310)
-app.include_router(gradeAPI)
\ No newline at end of file
+app.include_router(emp_api)
+app.include_router(gradeAPI)
+app.include_router(gradeAPI)
diff --git a/PythonProject/model/all_model.py b/PythonProject/model/all_model.py
index 74f785d..422cb09 100644
--- a/PythonProject/model/all_model.py
+++ b/PythonProject/model/all_model.py
@@ -159,7 +159,6 @@ class WlScore(Base):
 
     stu_id = Column( Integer
                     ,ForeignKey('wl_student.stu_id')
-                    ,autoincrement=True #自增主建
                     ,comment='学生编号')
 
     exam_order = Column(Integer
diff --git a/PythonProject/schema/employment_schema.py b/PythonProject/schema/employment_schema.py
index d353b40..4e93d2c 100644
--- a/PythonProject/schema/employment_schema.py
+++ b/PythonProject/schema/employment_schema.py
@@ -3,7 +3,7 @@ from pydantic import BaseModel, field_validator
 from datetime import date
 from typing import Optional
 
-class EmlpoymentRequest(BaseModel):
+class EmploymentRequest(BaseModel):
     stu_id: int=Query(ge=1)
     email: str|None
     employment_opening_date:date
diff --git a/PythonProject/schema/statistics_schema.py b/PythonProject/schema/statistics_schema.py
new file mode 100644
index 0000000..ab8e87b
--- /dev/null
+++ b/PythonProject/schema/statistics_schema.py
@@ -0,0 +1,15 @@
+from pydantic import BaseModel
+
+class AllStuResponse(BaseModel):
+    class_id: int
+    gender: str | None
+    cnt: int
+
+class AcgScoreResponse(BaseModel):
+    class_id: int
+    avg_score: float
+
+class AvgDayResponse(BaseModel):
+    class_id: int
+    avg_days: str | None
+
diff --git a/PythonProject/schema/student_schema.py b/PythonProject/schema/student_schema.py
index 307b556..2d9c631 100644
--- a/PythonProject/schema/student_schema.py
+++ b/PythonProject/schema/student_schema.py
@@ -1,5 +1,5 @@
 from datetime import date
-from typing import Self
+from typing import Self,List
 from pydantic import BaseModel, field_serializer, field_validator,model_validator
 
 
@@ -10,12 +10,12 @@ class StudentRequest(BaseModel):
     age:int |None = None
     gender:str |None = None
     native_place:str |None = None
-    birthday:date
+    birthday:date |None = None
     school:str |None = None
     major:str |None = None
     degree:str |None = None
-    admission_date:date
-    graduation_date:date
+    admission_date:date |None = None
+    graduation_date:date |None = None
     @field_validator('age')
     @classmethod
     def check_age(cls, v):
@@ -51,16 +51,32 @@ class StudentResponse(BaseModel):
 class StugetResponse(BaseModel):
     code:int = 200
     detail:str = 'ok'
+    class_id: int | None = None
+    stu_name: str | None = None
+    age: int | None = None
+    gender: str | None = None
+    native_place: str | None = None
+    birthday: date | None = None
+    school: str | None = None
+    major: str | None = None
+    degree: str | None = None
+    admission_date: date | None = None
+    graduation_date: date | None = None
+    progress: int = 0
+
+    @field_serializer('progress')
+    def int_to_string(cls, progress: int):
+        d1 = {
+            0: '学习中',
+            1: '求职中',
+            2: '已就业'
+        }
+        return d1.get(progress, '暂不明确')
+
+class StudentPageResponse(BaseModel):
+    code: int = 200
+    detail: str = "ok"
     page: int
     page_size: int
-    class_id: int
-    stu_name: str
-    age: int
-    gender: str
-    native_place: str
-    birthday: date
-    school: str
-    major: str
-    degree: str
-    admission_date: date
-    graduation_date: date
\ No newline at end of file
+    total: int
+    data: List[StugetResponse]
\ No newline at end of file
diff --git a/需求文档.md b/需求文档.md
index d6eb866..4e1059b 100644
--- a/需求文档.md
+++ b/需求文档.md
@@ -18,10 +18,6 @@ wl_class（班级编号，开课时间，删除状态(0：已删除,1：初始
 ⽼师管理表 **sgt 做完了**
 wl_teacher（老师编号，姓名，性别，年龄，删除状态(0：已删除,1：初始值)，职位，作成时间，更新时间）
 
-dao层（每一个功能就是一个函数，判断能否功能复用）
-
-通用模块
-
 学生模块
 实现增加学生的功能 **msj 做成中**
 实现查询学生的功能：需要能进行多条件查询 **msj 做成中**
@@ -56,8 +52,8 @@ dao层（每一个功能就是一个函数，判断能否功能复用）
 实现根据年龄查询学生信息的功能 **mrz 已作成**
 实现统计每个班级的学员总数以及男女生的总数的功能 **mrz 已作成**
 实现根据成绩查询学员信息的功能 **mrz 已作成**
-实现统计每次考试每个班级的平均分并排序的功能 **mrz 做成中**
-实现统计薪资最高的前五名的学员信息 **mrz 做成中**
+实现统计每次考试每个班级的平均分并排序的功能 **mrz 已作成**
+实现统计薪资最高的前五名的学员信息 **mrz 已作成**
 实现查询每个学生的就业时长 **msj 做成中**
-实现统计每个班级的平均就业时长 **xxx 做成中**
+实现统计每个班级的平均就业时长 **xxx 已作成**