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

PythonProject/api/teacher_api.py

@@ -36,9 +36,9 @@ def update_teacher1(t_id:int,teacher:Teacher_RequestModel,session=Depends(get_db
     return {'code':200,'detail':'cg'}
 
 
-@teacher_api.delete("/teachers",response_model=Teacher_ResponseModel,tags=['教师基本信息管理模块'],summary='删除教师接口')
-def delete_teacher1(id:int,session=Depends(get_db)):
-    r=delete_teacher(id=id,session=session)
+@teacher_api.delete("/teachers/{t_id}",tags=['教师基本信息管理模块'],summary='删除教师接口')
+def delete_teacher1(t_id:int,session=Depends(get_db)):
+    r=delete_teacher(id=t_id,session=session)
     if not r:
         raise HTTPException(status_code=500,detail='删除异常！')
-    return {'code': 200, 'totals': r}
+    return {'code': 200, 'detail': 'cg'}

PythonProject/dao/teacher_dao.py

@@ -35,9 +35,11 @@ def update_teacher(id:int,req,session):
 
 def delete_teacher(id:int,session):
     try:
-        session.query(Teacher_Model).filter(Teacher_Model.teac_id==id,Teacher_Model.delete_status==0)\
+        r=session.query(Teacher_Model).filter(Teacher_Model.teac_id==id,Teacher_Model.delete_status==0)\
             .update({'delete_status':1})
-        session.commit()
     except:
-        raise HTTPException(status_code=500,detail="删除异常")
-    return {'code':200,'details':'删除成功'}
+        session.rollback()
+        return False
+    else:
+        session.commit()
+        return r