diff --git a/stu_jiuye/CURD_api.py b/stu_jiuye/CURD_api.py index e35592e..4fd570b 100644 --- a/stu_jiuye/CURD_api.py +++ b/stu_jiuye/CURD_api.py @@ -112,7 +112,11 @@ def worktime(db=Depends(get_db)): .filter(Employments.is_deleted==0)\ .all() - return [{'学生姓名':i.sname,'就业时常':f'{i.offer_recived_time-i.employment_open_time}' if i.offer_recived_time and i.employment_open_time else '暂无数据'} for i in q] + return [ + {'学生姓名':i.sname + ,'就业时常':f'{i.offer_recived_time-i.employment_open_time}' + if i.offer_recived_time and i.employment_open_time else '暂无数据'} for i in q + ] @CURD.get('/avgworktime',summary='学生平均就业时常') diff --git a/stu_jiuye/model.py b/stu_jiuye/model.py index e5bb599..494e5de 100644 --- a/stu_jiuye/model.py +++ b/stu_jiuye/model.py @@ -1,5 +1,5 @@ from sqlalchemy import ForeignKey - +from student_manage_system import students,classes from stu_jiuye.database import DATETIME,Base,Column,Integer,String,DATE from datetime import datetime @@ -13,25 +13,19 @@ class Employments(Base): #学生就 # , ForeignKey='student.id' , comment='自增主键' ) - sname = Column(String(50) - # , ForeignKey='student.name' + + num = Column(Integer + , ForeignKey('students.num') ) #学生姓名,冗余字段 class_num = Column(Integer - # , ForeignKey='class.id' + , ForeignKey('classes.id') ) #学生班级,冗余字段 - - # compname=Column(String(50) - # ,nullable=False - # ) company_id = Column(Integer #公司id,外键匹配公司表 , ForeignKey('Company.id') , nullable=True ) - # address_id = Column(Integer - # , ForeignKey('Address.id') - # , nullable=False - # ) + employment_salary = Column(Integer, nullable=True) #薪资 employment_open_time = Column(DATE, nullable=True) #就业开放时间