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/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: