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

PythonProject/dao/student_dao.py

@@ -9,49 +9,61 @@ def select_age(min_age,max_age,session=Depends(get_db)):
             raise HTTPException(status_code=400, detail="请至少传入一个参数")
         session = session.query(Student_Model)
         if min_age is not None:
-            session = session.filter(Student_Model.age >= min_age)
+            session = session.filter(Student_Model.age >= min_age,Student_Model.delete_status == 0)
         if max_age is not None:
-            session = session.filter(Student_Model.age <= max_age)
+            session = session.filter(Student_Model.age <= max_age,Student_Model.delete_status == 0)
         return session.all()
     except HTTPException:
         raise
     except Exception:
         raise HTTPException(status_code=500,detail="查询异常")
 
-def delete_student_dao(stu_id,db):
+def add_student_dao(o,db=Depends(get_db)):
     try:
-        rows = db.query(Student_Model).filter(Student_Model.stu_id == stu_id).delete()
+        o1 = Student_Model( **o)
+        db.add(o1)
+    except:
+        db.rollback()
+        return False
+    else:
+        db.commit()
+        return True
+
+def delete_student_dao(stu_id,db=Depends(get_db)):
+    try:
+        rows = db.query(Student_Model).filter(Student_Model.stu_id == stu_id,Student_Model.delete_status == 0)\
+            .update({'delete_status':1})
+        db.commit()
     except:
         db.rollback()
         rows = 0
-    else:
-        db.commit()
     finally:
         return rows
 
-def update_student_dao(stu_id,update_data,db):
+def update_student_dao(stu_id,update_data,db=Depends(get_db)):
     try:
-        rows = db.query( Student_Model ).filter( Student_Model.stu_id == stu_id ).update( update_data )
+        rows = db.query( Student_Model ).filter( Student_Model.stu_id == stu_id,Student_Model.delete_status == 0).update( update_data )
     except:
         db.rollback()
         return False
     else:
         db.commit()
         return rows
+
 def get_student_dao(stu_id:Optional[int]
                    ,stu_name:Optional[str]
                    ,class_id:Optional[int]
-                   ,db: Session
                    ,page: int
                    ,page_size: int
+                   ,db=Depends(get_db)
                    ) -> tuple[List[Dict[str, Any]], int]:
     q = db.query(Student_Model)
     if stu_id:
-        q = q.filter(Student_Model.stu_id == stu_id)
+        q = q.filter(Student_Model.stu_id == stu_id,Student_Model.delete_status == 0)
     if stu_name:
-        q = q.filter(Student_Model.stu_name.like(f"%{stu_name}%"))
+        q = q.filter(Student_Model.stu_name.like(f"%{stu_name}%"),Student_Model.delete_status == 0)
     if class_id:
-        q= q.filter(Student_Model.class_id == class_id)
+        q= q.filter(Student_Model.class_id == class_id,Student_Model.delete_status == 0)
     total = q.count()
     r = q.offset((page - 1) * page_size).limit(page_size).all()
     data = []
@@ -63,3 +75,5 @@ def get_student_dao(stu_id:Optional[int]
                     ,'update_date': i.update_date
                     })
     return data, total
+
+

PythonProject/dao/teacher_dao.py

@@ -16,7 +16,7 @@ def add_teacher(req:Teacher_RequestModel,session=Depends(get_db)):
 
 def select_teacher(session=Depends(get_db)):
     try:
-        teacher_list=session.query(Teacher_Model).all()
+        teacher_list=session.query(Teacher_Model).filter(Teacher_Model.delete_status==0).all()
         return teacher_list
     except:
         raise HTTPException(status_code=500,detail="查询异常！")
@@ -24,15 +24,16 @@ def select_teacher(session=Depends(get_db)):
 def update_teacher(id:int,req:Teacher_RequestModel,session=Depends(get_db)):
     try:
         session.query(Teacher_Model).filter(Teacher_Model.teac_id==id)\
-        .update(req.model_dump(exclude_unset=True))
+        .filter(Teacher_Model.delete_status==0).update(req.model_dump(exclude_unset=True))
         session.commit()
     except:
         raise HTTPException(status_code=500,detail="更新异常！")
 
 def delete_teacher(id:int,session=Depends(get_db)):
     try:
-        session.query(Teacher_Model).filter(Teacher_Model.teac_id==id).delete()
+        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':'删除成功'}
+    return {'code':200,'details':'删除成功'}