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

PythonProject/model/all_model.py

@@ -1,4 +1,4 @@
-from sqlalchemy import DATETIME,Column,Integer,String,DATE,ForeignKey,Numeric
+from sqlalchemy import DATETIME,Column,Integer,String,DATE,ForeignKey,Numeric,UniqueConstraint
 from datetime import datetime
 from util.database import Base,engine
 
@@ -56,7 +56,7 @@ class ClassManagement(Base):
 
     class_id= Column(Integer, primary_key=True, autoincrement=True,comment='班级编号')
 
-    class_name = Column(String(100), comment='班级姓名')
+    class_name = Column(String(100), comment='班级名字')
 
     start_class_date = Column(DATE,comment='开课时间')
 
@@ -70,7 +70,7 @@ class ClassManagement(Base):
 
     delete_status = Column(Integer,default=0,comment='删除状态：0未删除，1已删除')
 
-    delete_time = Column(DATETIME,comment='删除时间')
+    delete_time = Column(DATETIME,default=datetime.now,onupdate=datetime.now,comment='删除时间')
 
 class Teacher_Model(Base):
     __tablename__ = 'wl_teacher'
@@ -89,8 +89,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='删除时间')
 
@@ -148,7 +147,7 @@ class Employment_info(Base):
     delete_status = Column(
         Integer,default=0,comment='删除状态：0未删除，1已删除')
 
-    delete_time = Column(DATETIME,comment='删除时间')
+    delete_time = Column(DATETIME,default=None,comment='删除时间')
 
 class WlScore(Base):
     __tablename__ = 'wl_score'