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

PythonProject/dao/grade_dao.py

@@ -21,4 +21,30 @@ def add_grade_dao(g,db):
         return o1
     except Exception:
         db.rollback()
-        return None
+        return None
+
+def update_grade_dao(score_id:int, update_data, db):
+    try:
+        rows = db.query(WlScore).filter(
+            WlScore.stu_id == score_id,
+            WlScore.delete_status == 0
+        ).update(update_data)
+    except:
+        db.rollback()
+        return False
+    else:
+        db.commit()
+        return rows
+
+def delete_grade_dao(stu_id:int,db):
+    try:
+        rows = db.query(WlScore).filter(
+            WlScore.stu_id == stu_id,
+            WlScore.delete_status == 0
+        ).update({'delete_status':1})
+    except:
+        db.rollback()
+        return False
+    else:
+        db.commit()
+        return rows

PythonProject/dao/teacher_dao.py

@@ -1,25 +1,31 @@
 from fastapi import HTTPException,Depends
-from model.all_model import Teacher_Model
-from util.database import *
 from schema.teacher_schema import Teacher_RequestModel
+from model.all_model import *
 
-def add_teacher(req:Teacher_RequestModel,session):
+def add_teacher(teacher,session):
     try:
-        data=req.model_dump()
-        session.add(Teacher_Model(**data))
+        print(teacher)
+        x=Teacher_Model(**teacher)
+        print(1)
+        session.add(x)
+        print(2)
         session.commit()
+        print(3)
+        return teacher
     except:
-        raise HTTPException(status_code=500,detail="添加异常！")
-    return req.model_dump()
+        session.rollback()
+        # raise HTTPException(status_code=500,detail='添加异常！')
+        return None
 
-def get_teacher(session):
-    try:
-        teacher_list=session.query(Teacher_Model).filter(Teacher_Model.delete_status==0).all()
-        return teacher_list
-    except:
-        raise HTTPException(status_code=500,detail="查询异常！")
+def get_teacher(id,session):
+    l=session.query(Teacher_Model).filter(Teacher_Model.teac_id==id)\
+            .filter(Teacher_Model.delete_status==0).all()
+    if l:
+        return l
+    else:
+        raise HTTPException(status_code=404,detail='该老师不存在！')
 
-def update_teacher(id:int,req:Teacher_RequestModel,session):
+def update_teacher(teac_id:int,req:Teacher_RequestModel,session):
     try:
         session.query(Teacher_Model).filter(Teacher_Model.teac_id==id)\
         .filter(Teacher_Model.delete_status==0).update(req.model_dump(exclude_unset=True))