diff --git a/stu_jiuye/CURD_api.py b/stu_jiuye/CURD_api.py index 3d90172..734b648 100644 --- a/stu_jiuye/CURD_api.py +++ b/stu_jiuye/CURD_api.py @@ -93,7 +93,7 @@ def delete_stuinfo( #删除模块 ): #根据id选择对象 rows = delete_emp_dao(id, db) #调用删除函数 if not rows: - raise HTTPException(status_code=500, detail='没有删除!') #失败返回错误信息 + raise HTTPException(status_code=404, detail='未找到该就业记录!') #失败返回错误信息 return {'code': 200, 'totals': rows, 'detail': '删除成功'} #成功返回信息 ''' diff --git a/stu_jiuye/dao.py b/stu_jiuye/dao.py index 96ac30e..fa60fa6 100644 --- a/stu_jiuye/dao.py +++ b/stu_jiuye/dao.py @@ -85,19 +85,19 @@ def get_emp_dao( #获取学生 # ,page # ,page_size ): #根据选择条件获取信息 - q = db.query(Employments,Company.employment_company,Address.somewhere) \ - .outerjoin(Students, Students.id == Employments.stuid) \ - .outerjoin(ClassInfo, ClassInfo.id == Employments.class_id)\ - .outerjoin(Company,Employments.company_id==Company.id)\ - .outerjoin(Address,Employments.address_id==Address.id)\ - .filter(Employments.is_deleted == 0) #连接公司表和地址表,筛选未被删除信息 + q = (db.query(Employments,Company.employment_company,Address.somewhere) + .outerjoin(Students, Students.id == Employments.stuid) + .outerjoin(ClassInfo, ClassInfo.id == Employments.class_id) + .outerjoin(Company,Employments.company_id==Company.id) + .outerjoin(Address,Employments.address_id==Address.id) + .filter(Employments.is_deleted == 0)) #连接公司表和地址表,筛选未被删除信息 # if stuid: # q = q.filter( Employments.id == stuid ) if sname: #根据学生姓名筛选 q = q.filter( Students.name == sname ) if class_id: - q = q.filter(ClassInfo.id == class_id) + q = q.filter(Employments.class_id == class_id) if somewhere: q = q.filter(Address.somewhere.like(f'%{somewhere}%')) if employment_company: #根据公司姓名筛选 @@ -119,7 +119,7 @@ def get_emp_dao( #获取学生 if r: return [ {"id": i.id, '学生姓名':sname, - '学生班级编号':class_id, + '学生班级编号':i.class_id, "公司": employment_company or '未就业', "公司区域":somewhere or '-', "薪资":i.employment_salary or '-', @@ -128,8 +128,8 @@ def get_emp_dao( #获取学生 # , "创建时间": i.create_time, # "更新时间": i.update_time, # "是否删除":i.is_deleted - } for i,sname,class_id,employment_company,somewhere in r ] #返回信息列表 - + } for i,sname,employment_company,somewhere in r ] #返回信息列表 + return {"code": 200, "totals": len(r), "data": r} def delete_emp_dao(id,db): #删除函数 try: