答辩完成后，整合get接口，添加一个误删除回档功能。

Reviewed-on: #49

api/class_api.py

@@ -12,44 +12,45 @@ classes_router = APIRouter()
 
 # ————定义班级表"新增"信息的接口函数————
 @classes_router.post('/',response_model=ClassResponse,summary='新增班级信息')        # POST新增请求，指定返回数据格式为 ClassResponse
-def post_classes(classes:ClassCreate,db=Depends(get_db)):          # 定义更新接口函数，参数classes声明创建请求模型，参数db依赖于数据库会话的上下文管理器
-    c = classes.model_dump()                                       # 变量c用来接收通过model_dump将Pydantic模型对象解析为Python的字典，方便后续解包传参
-    r = post_classes_dao( c , db )                                 # 变量r用来接收dao层post_classes_dao函数的返回值，执行函数时以变量c的数据和db依赖函数入参
-    if r :                                                         # 判断 DAO 层的返回结果，如果为True
-        return ClassResponse( total=1,data=c )                     # 返回成功响应，携带新增的数据给前端
-    else :                                                         # 如果为False
+def post_classes(classes:ClassCreate,db=Depends(get_db)):  # 定义更新接口函数，参数classes声明创建请求模型，参数db依赖于数据库会话的上下文管理器
+    c = classes.model_dump()                     # 变量c用来接收通过model_dump将Pydantic模型对象解析为Python的字典，方便后续解包传参
+    r = post_classes_dao( c , db )               # 变量r用来接收dao层post_classes_dao函数的返回值，执行函数时以变量c的数据和db依赖函数入参
+    if r :                                       # 判断 DAO 层的返回结果，如果为True
+        return ClassResponse( total=1,data=c )   # 返回成功响应，携带新增的数据给前端
+    else :                                       # 如果为False
         raise HTTPException(status_code=500,detail='添加失败，服务器繁忙，请稍后添加！') # 抛出 500 内部服务器错误 和提示
 
 
 # ————定义班级表"更新"信息的接口函数————
 @classes_router.put('/{id}',response_model=ClassResponse,summary='更新班级信息')    # put更新请求，指定返回数据格式为 ClassResponse
 def put_classes( classes:ClassUpdate , id:int , db=Depends( get_db ) ):                # 定义更新接口函数，id参数接收前端输入的数据，参数classes声明更新请求体模型，参数db依赖于数据库会话的上下文管理器
-    updates = classes.model_dump( exclude_unset=True )               # 变量updates用来接收通过model_dump将Pydantic模型对象解析为Python的字典(只解析输入的数据)，方便后续解包传参
-    r = update_classes_dao( id, db, updates )                        # 变量r用来接收dao层update_classes_dao函数的返回值，执行函数时以变量c的数据、db依赖函数、和前端更新的数据入参
-    if r :                                                           # 判断 DAO 层的返回结果，如果为True
+    updates = classes.model_dump( exclude_unset=True )         # 变量updates用来接收通过model_dump将Pydantic模型对象解析为Python的字典(只解析输入的数据)，方便后续解包传参
+    r = update_classes_dao( id, db, updates )                  # 变量r用来接收dao层update_classes_dao函数的返回值，执行函数时以变量c的数据、db依赖函数、和前端更新的数据入参
+    if r :                                                     # 判断 DAO 层的返回结果，如果为True
         return ClassResponse( detail='更新成功', total=1 ,data = updates )    # 返回成功响应，携带更新的数据给前端
     raise HTTPException( status_code=500, detail='更新失败，该班级已不存在或服务器繁忙，请稍后更新！' )  # 如果为False，抛出 500 内部服务器错误 和提示
 
 
 # ————定义班级表"查询"信息的接口函数————
-@classes_router.get('',summary='查询班级信息')                    # get查询请求
-def get_classes( id:int|None = None                                  # id参数接收前端输入的数据，声明是整数，可以为空默认为空
-               , class_no:str|None = None                            # class_no参数接收前端输入的数据，声明是字符串，可以为空默认为空
-               , class_name:str|None = None                          # class_name参数接收前端输入的数据，声明是字符串，可以为空默认为空
-               , page:int = 1                                        # page参数接收前端输入的数据，声明是整数，默认是1
-               , page_size:int = 5                                   # page参数接收前端输入的数据，声明是整数，默认是5
-               , db=Depends(get_db)                                  # 参数db依赖于数据库会话的上下文管理器
+@classes_router.get('',summary='查询班级信息')      # get查询请求
+def get_classes( id:int|None = None                    # id参数接收前端输入的数据，声明是整数，可以为空默认为空
+               , class_no:str|None = None              # class_no参数接收前端输入的数据，声明是字符串，可以为空默认为空
+               , class_name:str|None = None            # class_name参数接收前端输入的数据，声明是字符串，可以为空默认为空
+               , page:int = 1                          # page参数接收前端输入的数据，声明是整数，默认是1
+               , page_size:int = 5                     # page参数接收前端输入的数据，声明是整数，默认是5
+               , db=Depends(get_db)                    # 参数db依赖于数据库会话的上下文管理器
                ):
     t,r = get_classes_dao( id , class_no , class_name , page , page_size ,db )  # 变量t,r用来接收dao层get_classes_dao函数的返回值，执行函数时以前端输入的id , class_no , class_name , page , page_size 、db依赖函数入参
-    if t != 0 :                                                # 判断 DAO 层的返回结果，如果为条数不为0
-        return ClassResponse( total = t, data = r )            # 返回成功响应，返回符合条件的总条数，携带符合条件的数据给前端
-    else :                                                     # 判断 DAO 层的返回结果，如果为条数为0
-        return ClassResponse( code = 404,detail = '没有符合条件的班级，请检查输入是否有误')    # 返回404响应，提示没有符合条件的提示给前端
+    if t != 0 :                                        # 判断 DAO 层的返回结果，如果为条数不为0
+        return ClassResponse( total = t, data = r )    # 返回成功响应，返回符合条件的总条数，携带符合条件的数据给前端
+    return ClassResponse( code = 404,detail = '没有符合条件的班级，请检查输入是否有误')    # 判断 DAO 层的返回结果，如果为条数为0，返回404响应，提示没有符合条件的提示给前端
+
+
 
 # ————定义班级表"删除"信息的接口函数————
 @classes_router.delete('/{id}',response_model=ClassResponse,summary='删除班级信息')   # delete删除请求，指定返回数据格式为 ClassResponse
-def delete_classes(id:int,db=Depends(get_db)):                                           # 定义删除接口函数，id参数接收前端输入的数据，参数db依赖于数据库会话的上下文管理器
-    r = delete_classes_dao( id , db )                                                    # 变量r用来接收dao层delete_classes_dao函数的返回值，执行函数时以以前端输入的id 数据、db依赖函数入参
-    if  r :                                                                              # 判断 DAO 层的返回结果，如果是True
-        return ClassResponse( total=1,data='已成功删除班级信息' )                            # 返回成功响应和提示给前端                                                                    # 如果是False
+def delete_classes(id:int,db=Depends(get_db)):  # 定义删除接口函数，id参数接收前端输入的数据，参数db依赖于数据库会话的上下文管理器
+    r = delete_classes_dao( id , db )           # 变量r用来接收dao层delete_classes_dao函数的返回值，执行函数时以以前端输入的id 数据、db依赖函数入参
+    if  r :                                     # 判断 DAO 层的返回结果，如果是True
+        return ClassResponse( total=1,data='已成功删除班级信息' )  # 返回成功响应和提示给前端                                                                    # 如果是False
     raise HTTPException(status_code=500, detail='删除失败，该班级信息已不存在或服务器繁忙，请稍后更新！')  # 如果为False，抛出 500 内部服务器错误 和提示

api/employment.py

@@ -6,13 +6,14 @@ from dao.employment import (create_employment,
                             get_employment_by_student_id,
                             get_employment_list,
                             update_employment,
-                            delete_employment_logic)
+                            delete_employment_logic,
+                            recover_employment_delete)
 
 from schemas.employment import (EmploymentCreate,
                                 EmploymentUpdate,
                                 EmploymentResponse)
 
-employment_router = APIRouter(prefix="/employments", tags=["就业管理模块"])
+employment_router = APIRouter( tags=["就业管理模块"])
 
 
 @employment_router.post("/", response_model=EmploymentResponse, summary="新增就业信息")
@@ -28,36 +29,38 @@ def add_employment(body: EmploymentCreate, db: Session = Depends(get_db)):
     return res
 
 
-@employment_router.get("/students/{student_id}", response_model=EmploymentResponse, summary="查询指定学生的就业信息")
-def query_student_employment(student_id: int, db: Session = Depends(get_db)):
-    """根据学生id获取对应就业记录"""
-    record = get_employment_by_student_id(db, student_id)
-    if not record:
-        raise HTTPException(status_code=404, detail="未找到该学生的就业信息")
-    return record
+#
+
+# @employment_router.get("/students/{student_id}", response_model=EmploymentResponse, summary="查询指定学生的就业信息")
+# def query_student_employment(student_id: int, db: Session = Depends(get_db)):
+#     """根据学生id获取对应就业记录"""
+#     record = get_employment_by_student_id(db, student_id)
+#     if not record:
+#         raise HTTPException(status_code=404, detail="未找到该学生的就业信息")
+#     return record
 
 
 @employment_router.get("/", summary="就业信息列表，支持筛选")
-def query_employment_list(
-    company_name: str | None = Query(None, description="公司名称模糊查询"),
-    salary_min: float | None = Query(None, description="最低薪资"),
-    salary_max: float | None = Query(None, description="最高薪资"),
-    skip: int = Query(0, ge=0, description="偏移量"),
-    limit: int = Query(20, ge=1, le=100, description="每页条数"),
-    db: Session = Depends(get_db)
-):
+def query_employment_list(eid:int| None = Query(None, description="就业编号"),
+                          student_id:int| None = Query(None,description="学生id"),
+                          company_name: str | None = Query(None, description="公司名称模糊查询"),
+                          salary_min: float | None = Query(None, description="最低薪资"),
+                          salary_max: float | None = Query(None, description="最高薪资"),
+                          skip: int = Query(0, ge=0, description="偏移量"),
+                          limit: int = Query(20, ge=1, le=100, description="每页条数"),
+                          db: Session = Depends(get_db)):
     # 调用dao列表查询，拿到数据字典列表和总条数
     data_list, total = get_employment_list(db, company_name, salary_min, salary_max, skip, limit)
     return {"total": total, "data": data_list}
 
 
-@employment_router.get("/{eid}", response_model=EmploymentResponse, summary="根据id查询就业详情")
-def query_employment_detail(eid: int, db: Session = Depends(get_db)):
-    """根据就业主键id查询单条就业记录"""
-    record = get_employment_by_id(db, eid)
-    if not record:
-        raise HTTPException(status_code=404, detail="就业记录不存在或已被逻辑删除")
-    return record
+# @employment_router.get("/{eid}", response_model=EmploymentResponse, summary="根据id查询就业详情")
+# def query_employment_detail(eid: int, db: Session = Depends(get_db)):
+#     """根据就业主键id查询单条就业记录"""
+#     record = get_employment_by_id(db, eid)
+#     if not record:
+#         raise HTTPException(status_code=404, detail="就业记录不存在或已被逻辑删除")
+#     return record
 
 
 @employment_router.put("/{eid}", response_model=EmploymentResponse, summary="修改就业信息")
@@ -77,3 +80,12 @@ def logic_delete_employment(eid: int, db: Session = Depends(get_db)):
         raise HTTPException(status_code=404, detail="删除失败，记录不存在")
     # 删除成功返回提示字典
     return {"code": 200, "msg": "逻辑删除成功"}
+
+@employment_router.get("/{eid}", summary="回档逻辑删除就业记录")
+def recover_delete_employment(eid: int, db: Session = Depends(get_db)):
+    """执行逻辑删除，is_deleted置1，不会真正删除数据库行"""
+    ok = recover_employment_delete(db, eid)
+    if not ok:
+        raise HTTPException(status_code=404, detail="回档失败，记录已经存在")
+    # 删除成功返回提示字典
+    return {"code": 200, "msg": "回档成功"}

api/score.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Depends, HTTPException, Query
 from sqlalchemy.orm import Session
 from core.database import get_db
-from dao.score import post_score_dao, update_score_dao, get_score_dao,delete_score_dao, exist_student_exam_dao
+from dao.score import post_score_dao, update_score_dao, get_score_dao, get_all_scores_dao,delete_score_dao, exist_student_exam_dao
 from schemas.score import ScoreCreate, ScoreUpdate, ScorePageResp
 
 scores_router = APIRouter(prefix="/scores", tags=["成绩接口"])
@@ -32,6 +32,14 @@ def list_score(
 
 
 
+@scores_router.get("/all", response_model=ScorePageResp,
+                   summary="所有学生成绩接口",
+                  )
+def list_all_scores(page: int = Query(1, ge=1),
+                    page_size: int = Query(10, ge=1, le=100),
+                    db: Session = Depends(get_db)):
+    total, data_list = get_all_scores_dao(page, page_size, db)
+    return {"total": total, "data": data_list}
 
 @scores_router.put("{score_id}", summary="更新成绩接口")
 def modify_score(score_id: int, req: ScoreUpdate, db: Session = Depends(get_db)):

api/statistics.py

@@ -3,7 +3,6 @@ from core.database import get_db
 from models.employment import Employment
 from models.student import Student
 from models.score import Score
-from schemas.statistics import *
 from dao.statistics import *
 from schemas.common import SuccessResponse
 from sqlalchemy.orm import Session
@@ -12,34 +11,34 @@ from sqlalchemy.orm import Session
 statistics_router=APIRouter(tags=['统计接口'])
 
 
-@statistics_router.post("/students/age-over-30",response_model=SuccessResponse)
-def api_age_over_thirty(input_age:GenderCount,db:Session=Depends(get_db)):
+@statistics_router.get("/students/age-over-30",response_model=SuccessResponse)
+def api_age_over_thirty(db:Session=Depends(get_db)):
     try:
-        age_over_thirty_list=age_over_thirty(Student,input_age.input_class,db)
+        age_over_thirty_list=age_over_thirty(Student,db)
         return SuccessResponse(status_code=200,msg=age_over_thirty_list)
     except NoExist as e:
         raise HTTPException(status_code=404,detail=str(e))
 # 这边功能函数返回的是一个字典
 @statistics_router.get("/classes/gender-count",response_model=SuccessResponse)
-def api_gender_count(input_class:int|None= None,db:Session=Depends(get_db)):
+def api_gender_count(db:Session=Depends(get_db)):
     try:
-        result = gender_count(Student,db,input_class)
+        result = gender_count(Student,db)
         return SuccessResponse(status_code=200,msg=result)
     except NoExist as e:
         raise HTTPException(status_code=404,detail=str(e))
 
-@statistics_router.post("/scores/all-above-80",response_model=SuccessResponse)
-def all_above_eighty(page:int,score:StudentScore,db:Session=Depends(get_db)):
+@statistics_router.get("/scores/all-above-80",response_model=SuccessResponse)
+def all_above_eighty(db:Session=Depends(get_db)):
     try:
-        result = score_over_eighty(score.score,page,Score,Student,db)
+        result = score_over_eighty(Score,Student,db)
         return SuccessResponse(status_code=200,msg=result)
     except NoExist as e:
         raise HTTPException(status_code=404,detail=str(e))
 
 @statistics_router.get("/scores/fail-more-than-two",response_model=SuccessResponse)
-def fail_two(num:int,offset_set:int,db:Session=Depends(get_db)):
+def fail_two(db:Session=Depends(get_db)):
     try:
-        result = twice_error(num,offset_set,Score,Student,db)
+        result = twice_error(Score,Student,db)
         return SuccessResponse(status_code=200,msg=result)
     except NoExist as e:
         raise HTTPException(status_code=404,detail=str(e))
@@ -54,17 +53,17 @@ def class_average(db:Session=Depends(get_db)):
 
 
 @statistics_router.get("/employments/top5-salary",response_model=SuccessResponse)
-def top_salary(limit_set:int,db:Session=Depends(get_db)):
+def top_salary(db:Session=Depends(get_db)):
     try:
-        result=max_salary(limit_set,Student,Employment,db)
+        result=max_salary(Student,Employment,db)
         return SuccessResponse(status_code=200,msg=result)
     except NoExist as e:
         raise HTTPException(status_code=404,detail=str(e))
 
 @statistics_router.get("/employments/student-duration",response_model=SuccessResponse)
-def employ_time(limit_set,db:Session=Depends(get_db)):
+def employ_time(db:Session=Depends(get_db)):
     try:
-        result = student_market(limit_set,Employment,db)
+        result = student_market(Employment,db)
         return SuccessResponse(status_code=200,msg=result)
     except NoExist as e:
         raise HTTPException(status_code=404,detail=str(e))

api/student.py

@@ -1,4 +1,5 @@
-from fastapi import APIRouter, Depends, HTTPException
+
+from fastapi import APIRouter, Depends, HTTPException,Query,Path
 from sqlalchemy.orm import Session
 
 from core.database import get_db
@@ -6,7 +7,7 @@ from schemas.student import StudentCreate, StudentUpdate
 from dao import student as student_dao
 student_router = APIRouter()
 
-@student_router.post("",summary='添加学生')
+@student_router.put("",summary='添加学生')
 def create_student(request:StudentCreate,db:Session = Depends(get_db)):
     d = request.model_dump()
     r = student_dao.create_students(d,db)
@@ -14,7 +15,7 @@ def create_student(request:StudentCreate,db:Session = Depends(get_db)):
         raise HTTPException(status_code=500,detail='服务器繁忙，请稍后添加！')
     return {'code':200,'detail':"添加学生成功"}
 
-@student_router.put("/{id}", summary="修改学生")
+@student_router.post("/{id}", summary="更新学生信息")
 def update_student(
     id: int,
     request: StudentUpdate,
@@ -34,38 +35,69 @@ def update_student(
     if student is False:
         raise HTTPException(status_code=500, detail="修改学生失败")
 
+    #传入空字典报400
+    if not data:
+        raise HTTPException(
+            status_code=400,
+            detail="没有传入需要修改的字段",
+        )
+
     return {
         "code": 200,
         "detail": "修改学生成功",
         "data": student,
     }
 
-@student_router.get("", summary="查询学生列表")
+@student_router.get("", summary="分页查询学生列表")
 def get_students(
     # 三个查询条件都可以不传
-    student_no: str | None = None,
-    student_name: str | None = None,
-    class_id: int | None = None,
+    student_no: str | None = Query(default=None,description="按学号精确查询"),
+    student_name: str | None = Query(default=None,description="按名字模糊查询"),
+    class_id: int | None = Query(default=None,gt=0,description="按班级号精确查询"),
     # 获取本次请求使用的数据库连接
     db: Session = Depends(get_db),
+    page:int = Query(default=1,ge=1,description="页码，从1开始"),
+    page_size:int = Query(default=10,ge=1,le=100,description="每页条数,最多100条"),
 ):
     # 调用 DAO 查询数据库
-    students = student_dao.get_students(
+    total, students = student_dao.get_students(
         db=db,
         student_no=student_no,
         student_name=student_name,
         class_id=class_id,
+        page=page,
+        page_size=page_size,
     )
-
+    data = [
+        {
+            "id": student.id,
+            "student_no": student.student_no,
+            "student_name": student.student_name,
+            "class_id": student.class_id,
+            "consultant_id": student.consultant_id,
+            "native_place": student.native_place,
+            "graduation_school": student.graduation_school,
+            "major": student.major,
+            "enrollment_date": student.enrollment_date,
+            "graduation_date": student.graduation_date,
+            "education": student.education,
+            "age": student.age,
+            "gender": student.gender,
+        }
+        for student in students
+    ]
     return {
         "code": 200,
         "detail": "查询成功",
-        "total": len(students),
-        "data": students,
+        "total": total,
+        "page": page,
+        "page_size": page_size,
+        "data": data,
     }
 
 @student_router.get("/{id}", summary="查询学生详情")
-def get_student(id: int, db: Session = Depends(get_db)):
+def get_student(id: int = Path(gt=0),
+                db: Session = Depends(get_db)):
     # 根据路径中的 ID 查询学生
     student = student_dao.get_student_by_id(id, db)
 
@@ -73,10 +105,26 @@ def get_student(id: int, db: Session = Depends(get_db)):
         # 404 表示请求的数据不存在
         raise HTTPException(status_code=404, detail="学生不存在")
 
+    result = {
+            "id": student.id,
+            "student_no": student.student_no,
+            "student_name": student.student_name,
+            "class_id": student.class_id,
+            "consultant_id": student.consultant_id,
+            "native_place": student.native_place,
+            "graduation_school": student.graduation_school,
+            "major": student.major,
+            "enrollment_date": student.enrollment_date,
+            "graduation_date": student.graduation_date,
+            "education": student.education,
+            "age": student.age,
+            "gender": student.gender,
+        }
+
     return {
         "code": 200,
         "detail": "查询成功",
-        "data": student,
+        "data": result,
     }
 
 @student_router.delete("/{id}", summary="逻辑删除学生")

dao/class_dao.py

@@ -29,30 +29,46 @@ def update_classes_dao( class_id , db , updates ):     # 定义函数，设置
 
 
 # ————定义班级表"查询"信息的函数————
-def get_classes_dao( class_id, class_no , class_name , page , page_size , db ):   # 定义函数，设置六个形参class_id, class_no , class_name , page , page_size , db
-    q = db.query( Classes ).filter( Classes.is_deleted == 0 )                     # 初始化查询语句，基础过滤条件为筛选未删除的数据 (is_deleted=0)
-    if class_id :                                                                 # 如果传入了班级id参数
-        q = q.filter( Classes.id == class_id )                                    # 则追加id过滤条件
-    if class_no :                                                                 # 如果传入了班级no参数
-        q = q.filter( Classes.class_no == class_no )                              # 则追加no过滤条件
-    if class_name :                                                               # 如果传入了班级name参数
-        q = q.filter( Classes.class_name == class_name )                          # 则追加name过滤条件
-    total = q.count()                                                             # tatal变量接收满足当前所有过滤条件的数据总条数
-    r = q.offset( ( page-1 ) * page_size  ).limit( page_size ).all()              # 变量r用来接收查询取出结果列表，计算分页偏移量（从第几行开始查），设置分页限制条数
-    return total , [                                                              # 返回 total变量总条数 和 将查询结果列表转换为字典列表的数据
-                     {
-                         'class_id':i.id                  # 提取班级ID
-                       , 'class_no':i.class_no            # 提取班级编号
-                       , 'class_name':i.class_name        # 提取班级名称
-                       , 'start_date':i.start_date        # 提取开课日期
-                       , 'end_date':i.end_date            # 提取结课日期
-                       , 'created_at':i.created_at        # 提取创建时间
-                       , 'update_at':i.update_at          # 提取更新时间
-                       , 'remark':i.remark                # 提取备注信息
-                      }
-                      for i in r                          # 循环遍历查询出的每一行数据 i
-                    ]
+from sqlalchemy import func, and_ ,desc             # 从sqlalchemy模块导入func聚合函数的类、and_函数，降序排序desc函数
+from models.student import Student                  # 从models包下的student模块导入Student表模型类
 
+def get_classes_dao( class_id, class_no , class_name , page , page_size , db ):   # 定义函数，设置六个形参class_id, class_no , class_name , page , page_size , db
+    q = db.query(  Classes.id.label('class_id')  # 查询班级ID(别名class_id)
+                 , Classes.class_no  # 班级编号
+                 , Classes.class_name  # 班级名称
+                 , func.count(Student.id).label('student_count')  # 统计班级未删除的学生人数(别名student_count)
+                 , Classes.start_date   #开课时间
+                 , Classes.end_date    #结课时间
+                 , Classes.created_at   #创建时间
+                 , Classes.update_at    #更新时间
+                 , Classes.remark       #备注信息
+                 ). \
+                 outerjoin(Student, and_(Classes.id == Student.class_id, Student.is_deleted == 0)). \
+                 filter( Classes.is_deleted == 0 )  # 左连接学生表，并指定连接条件（未删除的学生）
+    if class_id :                                                        # 如果传入了班级id参数
+        q = q.filter( Classes.id == class_id )                           # 则追加id过滤条件
+    if class_no :                                                        # 如果传入了班级no参数
+        q = q.filter( Classes.class_no == class_no )                     # 则追加no过滤条件
+    if class_name :                                                      # 如果传入了班级name参数
+        q = q.filter( Classes.class_name == class_name )                 # 则追加name过滤条件
+    q = q.group_by(Classes.id, Classes.class_no, Classes.class_name)  # 按班级ID、编号、名称进行分组聚合
+    q = q.order_by( desc('student_count') )  # 按学生人数（别名）进行降序排列
+    total = q.count()  # total变量接收满足当前所有过滤条件的数据总条数
+    r = q.offset((page - 1) * page_size).limit(page_size).all()  # 变量r用来接收查询取出结果列表，计算分页偏移量（从第几行开始查），设置分页限制条数
+    return total, [  # 返回 total变量总条数 和 将查询结果列表转换为字典列表的数据
+                     {
+                           'class_id': i.class_id  # 提取班级ID
+                         , 'class_no': i.class_no  # 提取班级编号
+                         , 'class_name': i.class_name  # 提取班级名称
+                         , 'student_count': i.student_count  # 提取班级总人数
+                         , 'start_date':i.start_date        # 提取开课日期
+                         , 'end_date':i.end_date            # 提取结课日期
+                         , 'created_at':i.created_at        # 提取创建时间
+                         , 'update_at':i.update_at          # 提取更新时间
+                         , 'remark':i.remark                # 提取备注信息
+                     }
+                        for i in r  # 循环遍历查询出的每一行数据 i
+                  ]
 
 # ————定义班级表"删除"信息的函数————
 def delete_classes_dao( class_id , db  ):    # 定义函数，设置两个个形参class_id，db

dao/employment.py

@@ -1,17 +1,28 @@
-from sqlalchemy.orm import Session
 from models.employment import Employment
-from schemas.employment import EmploymentCreate, EmploymentUpdate, EmploymentResponse
+from schemas.employment import  EmploymentResponse
 
 
-def create_employment(db, obj_in):
+def create_employment(db, e):
+    # obj_in是Pydantic对象(EmploymentCreate)
     """新增就业信息：一个学生只能存在一条就业记录"""
     try:
-        db_obj = Employment(**obj_in.model_dump())
-        db.add(db_obj)                      # add：把对象加入数据库会话，此时还没写入数据库
-        db.commit()                         # commit：提交事务，真正写入mysql数据库
-        db.refresh(db_obj)                  # refresh：从数据库刷新对象，拿到数据库自动生成的id、默认时间等字段
-        return EmploymentResponse.model_validate(db_obj).model_dump()
-        # model_validate：把sqlalchemy ORM对象解析进pydantic响应模型
+        db_obj = Employment(**e.model_dump())
+        db.add(db_obj)
+        db.commit()
+        db.refresh(db_obj)
+
+        resp = EmploymentResponse(id=db_obj.id
+                                  ,student_id=db_obj.student_id
+                                  ,employment_status=db_obj.employment_status
+                                  ,employment_open_date=db_obj.employment_open_date
+                                  ,offer_date=db_obj.offer_date
+                                  ,company_name=db_obj.company_name
+                                  ,salary=db_obj.salary
+                                  ,remark=db_obj.remark
+                                  ,created_at=db_obj.created_at
+                                  ,updated_at=db_obj.updated_at)
+        return resp.model_dump()
+
     except Exception:
         db.rollback()
         return None
@@ -24,7 +35,18 @@ def get_employment_by_id(db, eid):
                                              ,Employment.is_deleted == 0).first()
         if not db_obj:
             return None
-        return EmploymentResponse.model_validate(db_obj).model_dump()
+
+        resp = EmploymentResponse(id=db_obj.id
+                                  ,student_id=db_obj.student_id
+                                  ,employment_status=db_obj.employment_status
+                                  ,employment_open_date=db_obj.employment_open_date
+                                  ,offer_date=db_obj.offer_date
+                                  ,company_name=db_obj.company_name
+                                  ,salary=db_obj.salary
+                                  ,remark=db_obj.remark
+                                  ,created_at=db_obj.created_at
+                                  ,updated_at=db_obj.updated_at)
+        return resp.model_dump()
     except Exception:
         return None
 
@@ -36,62 +58,115 @@ def get_employment_by_student_id(db, student_id):
                                              ,Employment.is_deleted == 0).first()
         if not db_obj:
             return None
-        return EmploymentResponse.model_validate(db_obj).model_dump()
+
+        resp = EmploymentResponse(id=db_obj.id
+                                  ,student_id=db_obj.student_id
+                                  ,employment_status=db_obj.employment_status
+                                  ,employment_open_date=db_obj.employment_open_date
+                                  ,offer_date=db_obj.offer_date
+                                  ,company_name=db_obj.company_name
+                                  ,salary=db_obj.salary
+                                  ,remark=db_obj.remark
+                                  ,created_at=db_obj.created_at
+                                  ,updated_at=db_obj.updated_at)
+        return resp.model_dump()
     except Exception:
         return None
 
 
-def get_employment_list(db, company_name=None, salary_min=None, salary_max=None, skip=0, limit=20):
+def get_employment_list(db, id=None,student_id=None,company_name=None, salary_min=None, salary_max=None, skip=0, limit=20):
     """就业列表查询；支持公司名模糊、薪资范围筛选；只查询is_deleted=0"""
     try:
         query = db.query(Employment).filter(Employment.is_deleted == 0)
+        if id is not None:
+            query = query.filter(Employment.id >= id)
+        if student_id is not None:
+            query = query.filter(Employment.student_id >= student_id)
         if company_name:
             query = query.filter(Employment.company_name.like(f"%{company_name}%"))
         if salary_min is not None:
             query = query.filter(Employment.salary >= salary_min)
         if salary_max is not None:
             query = query.filter(Employment.salary <= salary_max)
-        # count()统计满足条件总条数，用于分页total
+
         total = query.count()
-        # offset偏移量（跳过多少条），limit每页多少条，执行查询拿到结果列表
         records = query.offset(skip).limit(limit).all()
-        # 列表推导式：循环每一条ORM记录，全部转为字典，得到字典列表
-        dict_list = [EmploymentResponse.model_validate(item).model_dump() for item in records]
-        # 返回字典列表 + 总条数
+
+        dict_list = []
+        for item in records:
+            resp = EmploymentResponse(id=item.id
+                                      ,student_id=item.student_id
+                                      ,employment_status=item.employment_status
+                                      ,employment_open_date=item.employment_open_date
+                                      ,offer_date=item.offer_date
+                                      ,company_name=item.company_name
+                                      ,salary=item.salary
+                                      ,remark=item.remark
+                                      ,created_at=item.created_at
+                                      ,updated_at=item.updated_at)
+            dict_list.append(resp.model_dump())
+
         return dict_list, total
     except Exception:
-        # 异常返回空列表，总条数0
         return [], 0
 
 
-def update_employment(db, eid, obj_in):
+def update_employment(db, eid, e):
     """修改就业信息，只更新传入的字段"""
     try:
-        db_obj_raw = db.query(Employment).filter(Employment.id == eid
-                                                ,Employment.is_deleted == 0).first()
-        if db_obj_raw is None:
+        x = db.query(Employment).filter(Employment.id == eid
+                                                 ,Employment.is_deleted == 0).first()
+        if x is None:
             return None
-        update_dict = obj_in.model_dump(exclude_unset=True)# exclude_unset=True：只取出前端实际传过来的字段，不会带上没传的None字段
-        for key, value in update_dict.items():
-            setattr(db_obj_raw, key, value)
+
+        update_dict = e.model_dump(exclude_unset=True)
+        db.query(Employment).filter(Employment.id == eid
+                                    ,Employment.is_deleted == 0).update(update_dict)
+
         db.commit()
-        db.refresh(db_obj_raw)
-        return EmploymentResponse.model_validate(db_obj_raw).model_dump()
+        db.refresh(x)
+
+        resp = EmploymentResponse(id=x.id
+                                  ,student_id=x.student_id
+                                  ,employment_status=x.employment_status
+                                  ,employment_open_date=x.employment_open_date
+                                  ,offer_date=x.offer_date
+                                  ,company_name=x.company_name
+                                  ,salary=x.salary
+                                  ,remark=x.remark
+                                  ,created_at=x.created_at
+                                  ,updated_at=x.updated_at)
+        return resp.model_dump()
+
     except Exception:
         db.rollback()
-        return None
+        return
+
 
 
 def delete_employment_logic(db, eid):
     """逻辑删除，只修改is_deleted=1，不做物理删除"""
     try:
-        db_obj_raw = db.query(Employment).filter(Employment.id == eid
+        y = db.query(Employment).filter(Employment.id == eid
                                                  ,Employment.is_deleted == 0).first()
-        if db_obj_raw is None:
+        if y is None:
             return False
-        db_obj_raw.is_deleted = 1
+        y.is_deleted = 1
         db.commit()
         return True
     except Exception:
         db.rollback()
         return False
+
+def recover_employment_delete(db, eid):
+    """逻辑删除，只修改is_deleted=1，不做物理删除"""
+    try:
+        y = db.query(Employment).filter(Employment.id == eid).first()
+        if y is None:
+            return False
+        y.is_deleted = 0
+        db.commit()
+        return True
+    except Exception:
+        db.rollback()
+        return False

dao/score.py

@@ -1,4 +1,3 @@
-from sqlalchemy import DECIMAL
 from models.score import Score
 
 def post_score_dao(data_dict, db):
@@ -59,6 +58,28 @@ def get_score_dao(score_id, student_id, exam_seq, page, page_size, db):
     ]
     return total, res_list
 
+def get_all_scores_dao(page, page_size, db):
+    r = db.query(Score).filter(Score.is_deleted == 0)\
+           .order_by(Score.student_id, Score.exam_seq)
+    total = r.count()                                    # 总条数
+    rows = r.offset((page-1)*page_size).limit(page_size).all()# 分页
+    res_list_all = [
+        {
+            "id": i.id,
+            "student_id": i.student_id,
+            "score": i.score,
+            "exam_seq": i.exam_seq,
+            "exam_date": i.exam_date,
+            "remark": i.remark,
+            "created_at": i.created_at,
+            "updated_at": i.updated_at,
+            "is_deleted": i.is_deleted
+        }
+        for i in rows
+    ]
+    return total,res_list_all
+
+
 
 def delete_score_dao(score_id, db):
     """逻辑删除，更新is_deleted=1"""

dao/statistics.py

@@ -3,8 +3,9 @@ from sqlalchemy import func
 
 #`GET /statistics/students/age-over-30`
 #查询所有超过 30 岁的学员信息
-def age_over_thirty(Student,input_age,db):
-    student_list=db.query(Student).filter(Student.age>input_age,Student.is_deleted==0).all()
+
+def age_over_thirty(Student,db):
+    student_list=db.query(Student).filter(Student.age>30,Student.is_deleted==0).all()
     if not student_list :
         raise NoExist('无目标年龄大于30岁')
     # 把每个学生对象需要返回的字段，明确放进普通字典。
@@ -29,13 +30,9 @@ def age_over_thirty(Student,input_age,db):
             "is_deleted": student.is_deleted,
         })
     return result
-#统计男、女、总人数
-def gender_count(Student,db,input_class=None):
-    if input_class :
-        result = db.query(Student.class_id, Student.gender, func.count(Student.id)).filter(
-            Student.class_id == input_class, Student.is_deleted == 0).group_by(Student.class_id, Student.gender).all()
-    else:
-        result=db.query(Student.class_id,Student.gender,func.count(Student.id)).filter(Student.is_deleted==0).group_by(Student.class_id,Student.gender).all()
+
+def gender_count(Student,db):
+    result=db.query(Student.class_id,Student.gender,func.count(Student.id)).filter(Student.is_deleted==0).group_by(Student.class_id,Student.gender).all()
     if not result :
         raise NoExist('班里招点人吧，要倒闭了')
     dict1 = {}
@@ -46,11 +43,10 @@ def gender_count(Student,db,input_class=None):
         dict1[i]['总人数']+=k
     return dict1
 #查询每次考试成绩都在 80 分以上的学生编号、姓名和成绩
-#首先，拿到最低值>80的人的列表，row。然后，遍历元素拿到符合条件的id的属性。
-def score_over_eighty(score,offset_set,Score,Student,db):
+def score_over_eighty(Score,Student,db):
     student_list=db.query(Student.id, Student.student_name)\
                   .join(Score,Score.student_id==Student.id).filter(Student.is_deleted==0,Score.is_deleted==0).group_by(Student.id,Student.student_name)\
-                  .having(func.min(Score.score)>score).all()
+                  .having(func.min(Score.score)>80).all()
     if not student_list :
         raise NoExist('全是学渣')
     list1 = []
@@ -63,11 +59,10 @@ def score_over_eighty(score,offset_set,Score,Student,db):
                     "student_name": student_name,
                     "score": float(score) if score is not None else None,
                 })
-    list2=list1[5*(offset_set-1):5*offset_set]
-    return list2
+    return list1
 #查询有两次以上不及格的学生姓名、班级和不及格成绩
-def twice_error(num,offset_set,Score,Student,db):
-    student_list=db.query(Score.student_id).filter(Score.score<60,Score.is_deleted==0).group_by(Score.student_id).having(func.count(Score.id)>num).all()
+def twice_error(Score,Student,db):
+    student_list=db.query(Score.student_id).filter(Score.score<60,Score.is_deleted==0).group_by(Score.student_id).having(func.count(Score.id)>2).all()
     if not student_list :
         raise NoExist('全是学霸')
     list1=[]
@@ -80,8 +75,7 @@ def twice_error(num,offset_set,Score,Student,db):
                 "class_id": class_id,
                 "score": float(score) if score is not None else None,
             })
-    list2 = list1[5 * (offset_set - 1):5 * offset_set]
-    return list2
+    return list1
 
 #统计每次考试每个班级的平均分，并按照平均分从高到低排序
 def avg_class(Score,Student,db):
@@ -98,8 +92,8 @@ def avg_class(Score,Student,db):
     return result
 
 #统计就业薪资最高的前五名学生姓名、班级、就业时间、就业公司
-def max_salary(limit_set,Student,Employment,db):
-    student_list = db.query(Student.student_name,Student.class_id,Employment.offer_date,Employment.company_name).join(Employment, Student.id == Employment.student_id).filter(Student.is_deleted==0,Employment.is_deleted==0).order_by(Employment.salary.desc()).limit(limit_set).all()
+def max_salary(Student,Employment,db):
+    student_list = db.query(Student.student_name,Student.class_id,Employment.offer_date,Employment.company_name).join(Employment, Student.id == Employment.student_id).filter(Student.is_deleted==0,Employment.is_deleted==0).order_by(Employment.salary.desc()).limit(5).all()
     if not student_list :
         raise NoExist('没就业的啊兄弟？')
     result = []
@@ -114,8 +108,8 @@ def max_salary(limit_set,Student,Employment,db):
 
 # - 统计每个学生的就业时长
 # - 就业时长 = `offer_date - employment_open_date`
-def student_market(limit_set,Employment,db):
-    student_list = db.query(Employment.student_id,func.datediff(Employment.offer_date,Employment.employment_open_date)).filter(Employment.is_deleted==0).limit(limit_set).all()
+def student_market(Employment,db):
+    student_list = db.query(Employment.student_id,func.datediff(Employment.offer_date,Employment.employment_open_date)).filter(Employment.is_deleted==0).all()
     result = []
     for student_id, duration_days in student_list:
         result.append({

dao/student.py

@@ -1,9 +1,7 @@
-from schemas.student import *
-from core.database import get_db
-from models.student import *
+from models.student import Student
 from sqlalchemy.orm import Session
 
-
+#新建学生
 def create_students(d: dict, db: Session):
     stu = Student(**d)
 
@@ -22,6 +20,7 @@ def create_students(d: dict, db: Session):
         print(f"插入学生失败: {e}")
         return None
 
+#查询学生是否已经被逻辑删除
 def get_student_by_id(student_id: int, db: Session):
     # 同时判断 is_deleted，已经逻辑删除的学生不会被查到
     return db.query(Student).filter(
@@ -29,6 +28,7 @@ def get_student_by_id(student_id: int, db: Session):
         Student.is_deleted == 0,
     ).first()
 
+#更新学生信息
 def update_student(student_id: int, data: dict, db: Session):
     # 第一步：先查询学生
     student = get_student_by_id(student_id, db)
@@ -54,11 +54,14 @@ def update_student(student_id: int, data: dict, db: Session):
         print("修改学生失败：", e)
         return False
 
+#允许条件输入的列表查询
 def get_students(
     db: Session,
     student_no: str | None = None,
     student_name: str | None = None,
     class_id: int | None = None,
+    page: int = 1,
+    page_size: int = 10,
 ):
     # 第一步：只查询没有被删除的学生
     query = db.query(Student).filter(Student.is_deleted == 0)
@@ -72,12 +75,22 @@ def get_students(
         # 姓名使用模糊查询，例如“张”可以查到“张三”
         query = query.filter(Student.student_name.like(f"%{student_name}%"))
 
-    if class_id:
         # 班级 ID 使用精确查询
-        query = query.filter(Student.class_id == class_id)
+    if class_id is not None:
+            query = query.filter(Student.class_id == class_id)
 
-    # 第三步：执行查询并返回全部结果
-    return query.all()
+    # 分页之前统计符合条件的总条数
+    total = query.count()
+
+    #默认按学生id排序
+    students = (
+        query
+        .order_by(Student.id.desc())
+        .offset((page - 1) * page_size)
+        .limit(page_size)
+        .all()
+    )
+    return total, students
 
 #逻辑删除学生
 def delete_student(student_id: int, db: Session):

main.py

@@ -1,7 +1,4 @@
 from fastapi import FastAPI
-from fastapi.responses import RedirectResponse
-from fastapi.staticfiles import StaticFiles
-from pathlib import Path
 from api.example import example_router
 from middleware import log_middleware
 from api.statistics import statistics_router
@@ -11,12 +8,6 @@ from api.teacher import router as teacher_router,class_teacher_router
 from api.magic import magic_router
 
 app = FastAPI(title='学生管理系统')
-app.mount("/ui", StaticFiles(directory=Path(__file__).resolve().parent / "frontend", html=True), name="frontend")
-
-@app.get("/", include_in_schema=False)
-def home():
-    return RedirectResponse("/ui/")
-
 app.middleware("http")(log_middleware)
 app.include_router(magic_router)
 
@@ -34,6 +25,7 @@ from api import consultant
 app.include_router(consultant.router)
 #-------------张昕浩---------------
 app.include_router(example_router)
+app.include_router(magic_router)
 app.include_router(statistics_router, prefix="/statistics")
 
 #-------------曾凯---------------

models/employment.py

@@ -1,17 +1,17 @@
-from sqlalchemy import *
-from sqlalchemy.orm import declarative_base,sessionmaker
+from sqlalchemy import *               #导入sqlalchemy全部常用类
+from sqlalchemy.orm import declarative_base,sessionmaker  #造会话工厂 SessionLocal，管数据库增删改查会话
 from datetime import datetime
-from core.database import Base
+from core.database import Base         #保证所有模型共用同一个Base，表才能正常生成
 
 # 为了符合三范式，就业表只保存 student_id，不保存学生姓名和班级名称。查询返回时通过关联 students 和 classes 带出学生姓名、班级名称。
 
 class Employment(Base):
-    __tablename__ = "employment_info_detail"                   # 实际数据库的表名字
+    __tablename__ = "employment_info_detail"                   # 映射的真实MySQL数据库表名
     id = Column(Integer, primary_key=True                      # 主键
-                , autoincrement=True                           # 声明是自增主键
+                , autoincrement=True                           # 开启自增，插入数据不需要手动传id，数据库自动生成id
                 ,comment="就业信息主键id")
     student_id = Column(Integer, ForeignKey("student_info_detail.id")  # 外键 -> students.id
-                        , nullable=False                       # 不允许为null
+                        , nullable=False                       # 不允许为null，每一条就业记录必须绑定一个学生
                         ,comment="关联学生id")
     employment_status = Column(String(50)
                                , default="not_started"

schemas/class_schema.py

@@ -6,11 +6,11 @@ from datetime import datetime,date       # 导入datetime模块下的datetime,da
 
 # ————定义"创建班级"的"请求体"模型————
 class ClassCreate( BaseModel ):         # "创建"班级信息的请求体模型
-    class_no: str                       # 班级编号"，不可为空
-    class_name: str                     # 班级名字"，不可为空
-    start_date : date|None = None       # 班级开课日期"，可以为空，默认为空
-    end_date : date|None = None         # 班级结课日期"，可以为空，默认为空
-    remark : str|None = None            # 班级备注"，可以为空，默认为空
+    class_no: str                       # 班级编号，不可为空
+    class_name: str                     # 班级名字，不可为空
+    start_date : date|None = None       # 班级开课日期，可以为空，默认为空
+    end_date : date|None = None         # 班级结课日期，可以为空，默认为空
+    remark : str|None = None            # 班级备注，可以为空，默认为空
 
 # ————定义"更新班级"的"请求体"模型————
 class ClassUpdate( BaseModel ):          # "更新"班级信息的请求体模型
@@ -25,4 +25,4 @@ class ClassResponse( BaseModel ):        # 班级信息的响应体模型
     code:int = 200                       # 状态码，默认200
     detail:str = '执行成功'                # 提示信息
     total:int = 0                        # 数据总条数，默认为0
-    data:str|dict|list|tuple             # 返回的数据
+    data:str|dict|list|tuple = ''        # 返回的数据,默认为空字符串

schemas/employment.py

@@ -1,12 +1,12 @@
-from pydantic import BaseModel, Field,ConfigDict
+from pydantic import BaseModel, Field
 from datetime import date, datetime
 from decimal import Decimal
 
 
 class EmploymentCreate(BaseModel):
     """新增就业信息 请求体 Schema"""
-    student_id: int = Field(..., description="关联学生ID，必填")
-    employment_status: str | None = Field(None, description="就业状态：not_started/job_hunting/offered/employed")
+    student_id: int = Field(..., description="关联学生ID，必填")# description：在Swagger页面展示字段说明文字
+    employment_status: str | None = Field(None, description="就业状态,选填")
     employment_open_date: date | None = Field(None, description="就业开放时间，选填")
     offer_date: date | None = Field(None, description="offer下发时间，选填")
     company_name: str | None = Field(None, max_length=100, description="就业公司名称，选填")
@@ -36,4 +36,3 @@ class EmploymentResponse(BaseModel):
     remark: str | None
     created_at: datetime | None
     updated_at: datetime | None
-    model_config = ConfigDict(from_attributes=True) #允许pydantic从对象属性里取值

schemas/statistics.py

@@ -1,13 +1,4 @@
-from pydantic import BaseModel,Field
-
 class NoExist(Exception):
     def __init__(self,value):
         self.value = value
-        pass
-
-
-class GenderCount(BaseModel):
-    input_class:int|None = None
-
-class StudentScore(BaseModel):
-    score:int = Field(default = 80, ge = 0, le = 100)
+        pass

schemas/student.py

@@ -1,7 +1,8 @@
-from pydantic import BaseModel
 from datetime import date
 from pydantic import BaseModel, ConfigDict, Field, model_validator
+from typing import Literal
 
+#新建学生请求体
 class StudentCreate(BaseModel):
     student_no: str | None = Field(default=None, min_length=1, max_length=50)
     student_name: str = Field(min_length=1, max_length=50)
@@ -14,7 +15,7 @@ class StudentCreate(BaseModel):
     graduation_date: date | None = None
     education: str | None = Field(default=None, max_length=50)
     age: int = Field(ge=0, le=150)
-    gender: str = Field(min_length=1, max_length=10)
+    gender: Literal["男", "女"]
 
     @model_validator(mode="after")
     def check_dates(self):
@@ -23,18 +24,19 @@ class StudentCreate(BaseModel):
             raise ValueError("毕业日期不能早于入学日期")
         return self
 
+#更新学生请求体
 class StudentUpdate(BaseModel):
     # 全部设为可选，前端只传需要修改的字段
-    student_no: str | None = None
-    student_name: str | None = None
-    class_id: int | None = None
-    consultant_id: int | None = None
-    native_place: str | None = None
-    graduation_school: str | None = None
-    major: str | None = None
-    enrollment_date: date | None = None
-    graduation_date: date | None = None
-    education: str | None = None
-    age: int | None = None
-    gender: str | None = None
+        student_no: str | None = Field(default=None, min_length=1, max_length=50)
+        student_name: str | None = Field(default=None, min_length=1, max_length=50)
+        class_id: int | None = Field(default=None, gt=0)
+        consultant_id: int | None = Field(default=None, gt=0)
+        native_place: str | None = Field(default=None, max_length=100)
+        graduation_school: str | None = Field(default=None, max_length=100)
+        major: str | None = Field(default=None, max_length=100)
+        enrollment_date: date | None = None
+        graduation_date: date | None = None
+        education: str | None = Field(default=None, max_length=50)
+        age: int | None = Field(default=None, ge=0, le=150)
+        gender: Literal["男", "女"] | None = None