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

PythonProject/dao/cla_dao.py

@@ -15,9 +15,9 @@ def add_class_dao(c:claRequest,session):
         session.commit()
         return '添加成功！'
 
-def get_class_dao(session):
+def get_class_dao(n,m,session):
     try:
-        class_list=session.query(ClassManagement).filter(ClassManagement.delete_status==0).all()
+        class_list=session.query(ClassManagement).filter(ClassManagement.delete_status==0).offset((n-1)*m).limit(m).all()
         return class_list
     except:
         raise HTTPException(status_code=406,detail="输入查询信息有误，请重新输入！")
@@ -60,7 +60,6 @@ def get_class_for_delete(id: int, session):
         "class_teacher_id": obj.class_teacher_id,
     }
 
-
 def hard_delete_class(id: int, session):
     try:
         obj = (

PythonProject/dao/teacher_dao.py

@@ -6,11 +6,8 @@ def add_teacher(teacher,session):
     try:
         print(teacher)
         x=Teacher_Model(**teacher)
-        print(1)
         session.add(x)
-        print(2)
         session.commit()
-        print(3)
         return teacher
     except:
         session.rollback()
@@ -25,19 +22,24 @@ def get_teacher(id,session):
     else:
         raise HTTPException(status_code=404,detail='该老师不存在！')
 
-def update_teacher(teac_id:int,req:Teacher_RequestModel,session):
+def update_teacher(id:int,req,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))
-        session.commit()
+        r=session.query(Teacher_Model).filter(Teacher_Model.teac_id==id) \
+            .filter(Teacher_Model.delete_status==0).update(req)
     except:
-        raise HTTPException(status_code=500,detail="更新异常！")
+        session.rollback()
+        return False
+    else:
+        session.commit()
+        return r
 
 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