Merge remote-tracking branch 'origin/coffee_all' into lon_students_merge_code_test

# Conflicts:
#	stu_jiuye/database.py
#	stu_jiuye/main.py
This commit is contained in:
Orangeeee
2026-09-22 16:48:37 +08:00
7 changed files with 58 additions and 54 deletions
+10 -31
View File
@@ -5,31 +5,6 @@ from stu_jiuye.database import DATETIME,Base,Column,Integer,String,DATE
from datetime import datetime
# class Student(Base):
# __tablename__ = 'Student'
# id = Column(Integer
# , primary_key=True
# , autoincrement=True
# # 外键
# ,comment='自增主键'
# )
# stuname = Column(String(50)
# ,nullable=False
# )
# stuid=Column(Integer
# ,nullable=False
# )
# stuclass=Column(String(50)
# ,nullable=False
# )
# created_date = Column(DATETIME
# ,default=datetime.now
# )
# updated_date = Column(DATETIME
# ,default=datetime.now
# ,onupdate=datetime.now
# )
class Employments(Base_all): #学生就业信息基类
__tablename__ = 'Employments' #表名
@@ -39,8 +14,12 @@ class Employments(Base_all): #学生
# , ForeignKey('student.id')
, comment='自增主键'
)
sname = Column(String(50)) #学生姓名,冗余字段
class_num = Column(Integer) #学生班级,冗余字段
sname = Column(String(50)
# , ForeignKey='student.name'
) #学生姓名,冗余字段
class_num = Column(Integer
# , ForeignKey='class.id'
) #学生班级,冗余字段
# compname=Column(String(50)
# ,nullable=False
@@ -82,10 +61,10 @@ class Company(Base_all): #公司
, ForeignKey('Address.id') #外键地址表id
, nullable=False #非空约束
)
created_date = Column(DATETIME
create_time = Column(DATETIME
, default=datetime.now
)
updated_date = Column(DATETIME
update_time = Column(DATETIME
, default=datetime.now
, onupdate=datetime.now
)
@@ -100,10 +79,10 @@ class Address(Base_all):
somewhere=Column(String(50) #地址区域
, nullable=False
)
created_date = Column(DATETIME
create_time = Column(DATETIME
, default=datetime.now
)
updated_date = Column(DATETIME
update_time = Column(DATETIME
, default=datetime.now
, onupdate=datetime.now
)