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

PythonProject/dao/teacher_dao.py

@@ -1,5 +1,6 @@
 from fastapi import HTTPException
 from model.all_model import Teacher_Model
+from datetime import datetime
 
 def add_teacher(teacher,session):
     try:
@@ -34,7 +35,7 @@ def update_teacher(id:int,req,session):
 def delete_teacher(id:int,session):
     try:
         r=session.query(Teacher_Model).filter(Teacher_Model.teac_id==id,Teacher_Model.delete_status==0)\
-            .update({'delete_status':1})
+            .update({'delete_status':1,'delete_time':datetime.now()})
     except:
         session.rollback()
         return False

PythonProject/model/all_model.py

@@ -11,7 +11,7 @@ class Student_Model(Base):
                     ,comment='学生编号')
 
     class_id = Column(Integer
-                    ,ForeignKey('wl_class.class_id')
+                    ,ForeignKey('wl_class.class_id', ondelete='CASCADE')
                     ,comment='班级编号'
                     )
 
@@ -87,8 +87,7 @@ class Teacher_Model(Base):
 
     update_date=Column(DATETIME,default=datetime.now,onupdate=datetime.now)
 
-    delete_status = Column(
-        Integer,default=0,comment='删除状态：0未删除，1已删除')
+    delete_status = Column(Integer,default=0,comment='删除状态：0未删除，1已删除')
 
     delete_time = Column(DATETIME,comment='删除时间')