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

Reviewed-on: #7

PythonProject/api/grade_api.py

@@ -19,13 +19,6 @@ def get_grade(stu_id: int,db=Depends(get_db)):
     except Exception as e:
         raise HTTPException(status_code=500,detail=f'数据库查询异常:{str(e)}')
 
-@gradeAPI.delete('/{stu_id}',summary='删除成绩')
-def delete_grade(stu_id:int,db=Depends(get_db)):
-    r = delete_grade_dao(stu_id=stu_id,db=db)
-    if not r:
-        raise HTTPException(status_code=404,detail='删除失败')
-    return {'code':200,'totals':r,'detail':'删除成功'}
-
 @gradeAPI.post('/grade',summary='添加学生成绩')
 def post_grade(o:GradeRequest,db=Depends(get_db)):
     d=o.model_dump()
@@ -79,3 +72,9 @@ def put_grade(
 
     return {"code": 200, "totals": rows, "detail": "更新成功"}
 
+@gradeAPI.delete('/{score_id}',summary='删除成绩')
+def delete_grade(score_id:int,db=Depends(get_db)):
+    r = delete_grade_dao(stu_id=score_id,db=db)
+    if not r:
+        raise HTTPException(status_code=404,detail='删除失败')
+    return {'code':200,'totals':r,'detail':'删除成功'}

PythonProject/api/student_api.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter,HTTPException,Depends,Query
+from fastapi import APIRouter,HTTPException,Depends
 from dao.student_dao import *
 from schema.student_schema import *
 from util.database import get_db
@@ -6,6 +6,24 @@ from util.database import get_db
 
 StudentAPI = APIRouter(tags=['学生基本信息管理模块'])
 
+@StudentAPI.get('/students',response_model=StuPageResponse,summary='学生信息查询接口',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, total = get_student_dao(stu_id=stu_id
+                               ,stu_name=stu_name
+                               ,class_id=class_id
+                               ,page=page
+                               ,page_size=page_size
+                               ,db=db)
+    return StuPageResponse(page=page,
+                               page_size=page_size,
+                               totals=total,
+                               data=r)
+
 @StudentAPI.post('/students',response_model=StugetResponse,summary='学生信息新增接口',description='新增学生信息')
 def add_students(s:StudentRequest
                  ,db=Depends(get_db)):
@@ -19,24 +37,6 @@ def add_students(s:StudentRequest
         raise HTTPException(status_code=500, detail='添加失败，请稍后重试')
     return r
 
-@StudentAPI.get('/students',response_model=StuPageResponse,summary='学生信息查询接口',description='查询学生信息')
-def get_students(stu_id:int=Query(None,description='学生id')
-                ,stu_name:str=Query(None,description='学生姓名')
-                ,class_id:int=Query(None,description='班级编号')
-                ,db=Depends(get_db)
-                ,page:int=Query(None,description='页数')
-                ,page_size:int=Query(None,description='行数')):
-    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)
-    return StuPageResponse(page=page
-                           ,page_size=page_size
-                           ,totals=total
-                           ,data=r)
-
 @StudentAPI.put('/students/{stu_id}',summary='学生信息更新接口',description='更新学生信息')
 def update_students(stu_id:int
                     ,s:StuUpdateRequest
@@ -53,7 +53,7 @@ def update_students(stu_id:int
     return {'code':200,'totals':r,'detail':'更新成功'}
 
 @StudentAPI.delete('/students/{stu_id}',response_model= StudelResponse,summary='学生信息删除接口',description='删除学生信息')
-def del_students(stu_id:int=Query(None,description='班级编号')
+def del_students(stu_id:int
                  ,db=Depends(get_db)):
     rows=delete_student_dao( stu_id=stu_id,db=db )
     if not rows:

PythonProject/dao/grade_dao.py

@@ -19,19 +19,14 @@ def get_score_by_stu_exam_order_dao(stu_id:str,exam_order:int,db):
 
 def get_grade_dao( stu_id:int , db):
 
-    r1 =(db.query(  WlScore.score_id
-                   ,WlScore.stu_id
-                   ,Student_Model.stu_name
-                   ,WlScore.exam_order
-                   ,WlScore.score
-                   ,ClassManagement.class_name
+    r1 =(db.query( WlScore.score_id
+                  ,WlScore.stu_id
+                  ,Student_Model.stu_name
+                  ,WlScore.exam_order
+                  ,WlScore.score
                    )
-         .join( Student_Model,WlScore.stu_id == Student_Model.stu_id)
-         .join(ClassManagement,Student_Model.class_id==ClassManagement.class_id)
-         .filter(  WlScore.stu_id == stu_id
-                  ,WlScore.delete_status == 0
-                  ,Student_Model.delete_status == 0
-                  ,ClassManagement.delete_status == 0)
+         .join(Student_Model,WlScore.stu_id == Student_Model.stu_id)
+         .filter(WlScore.stu_id == stu_id,WlScore.delete_status == 0,Student_Model.delete_status == 0)
          .all())
     if r1:
         data_list = []
@@ -41,8 +36,7 @@ def get_grade_dao( stu_id:int , db):
                 "stu_id": row.stu_id,
                 "stu_name": row.stu_name,
                 "exam_order": row.exam_order,
-                "score": row.score,
-                "class_name": row.class_name,
+                "score": row.score
             })
         return data_list
     else:

PythonProject/dao/student_dao.py

@@ -5,11 +5,11 @@ from sqlalchemy.exc import IntegrityError
 
 def add_student_dao(o,db):
     if o.get('id_card'):
-        o1 = (db.query(Student_Model)
+        conflict = (db.query(Student_Model)
                     .filter(Student_Model.id_card == o['id_card'],
                             Student_Model.delete_status == 0)
                     .first())
-        if o1:
+        if conflict:
             return 'conflict'
     try:
         o2 = Student_Model(**o)
@@ -23,23 +23,17 @@ def add_student_dao(o,db):
         db.rollback()
         return 'error'
 
-def get_student_dao(stu_id:Optional[int]
-                   ,stu_name:Optional[str]
-                   ,class_id:Optional[int]
-                   ,page: int
-                   ,page_size: int
-                   ,db
-                   ) -> tuple[List[Dict[str, Any]], int]:
-    q = db.query(Student_Model).filter(Student_Model.delete_status == 0)
-    if stu_id:
-        q = q.filter(Student_Model.stu_id == stu_id)
-    if stu_name and stu_name.strip() != "":
-        q = q.filter(Student_Model.stu_name.like(f"%{stu_name}%"))
-    if class_id:
-        q = q.filter(Student_Model.class_id == class_id)
-    total = q.count()
-    r = q.offset((page - 1) * page_size).limit(page_size).all()
-    return r, total
+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, 'delete_time': datetime.now()}))
+        db.commit()
+        return rows
+    except Exception:
+        db.rollback()
+        raise
 
 def update_student_dao(stu_id, update_data, db):
     if not update_data:
@@ -58,14 +52,20 @@ def update_student_dao(stu_id, update_data, db):
         return 'error'
     return rows
 
-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, 'delete_time': datetime.now()}))
-        db.commit()
-        return rows
-    except Exception:
-        db.rollback()
-        raise
+def get_student_dao(stu_id:Optional[int]
+                   ,stu_name:Optional[str]
+                   ,class_id:Optional[int]
+                   ,page: int
+                   ,page_size: int
+                   ,db
+                   ) -> tuple[List[Dict[str, Any]], int]:
+    q = db.query(Student_Model).filter(Student_Model.delete_status == 0)
+    if stu_id:
+        q = q.filter(Student_Model.stu_id == stu_id)
+    if stu_name and stu_name.strip() != "":
+        q = q.filter(Student_Model.stu_name.like(f"%{stu_name}%"))
+    if class_id:
+        q = q.filter(Student_Model.class_id == class_id)
+    total = q.count()
+    r = q.offset((page - 1) * page_size).limit(page_size).all()
+    return r, total

PythonProject/schema/student_schema.py

@@ -1,5 +1,5 @@
 from datetime import date
-from typing import Self,List,Optional
+from typing import Self,List
 from pydantic import BaseModel, field_serializer, field_validator,model_validator,ConfigDict
 
 
@@ -53,13 +53,6 @@ class StuUpdateRequest(BaseModel):
             raise ValueError('年龄不能为负数')
         return v
 
-    @field_validator('id_card')
-    @classmethod
-    def check_id_card(cls, v):
-        if len(v) != 18 or len(v) != 19 :
-            raise ValueError('身份证输入有误')
-        return v
-
     @model_validator(mode='after')
     def check_admission_graduation(self) -> Self:
         if self.admission_date and self.graduation_date:
@@ -84,7 +77,7 @@ class StugetResponse(BaseModel):
     degree: str | None = None
     admission_date: date | None = None
     graduation_date: date | None = None
-    progress: Optional[int]
+    progress: int
 
     @field_serializer('progress')
     def progress_to_label(self, progress):