- | ${e.sname || '-'} |
- 班级${e.class_id} |
- ${e.company_name || '-'} |
- ¥${(e.employment_salary || 0).toLocaleString()} |
- ${e.offer_recived_time || '待定'} |
- ${e.offer_recived_time ? '已就业' : '待就业'} |
+ ${e['学生姓名'] || '-'} |
+ 班级${e['学生班级编号'] || '-'} |
+ ${e['公司'] || '-'} |
+ ¥${(e['薪资'] || 0).toLocaleString()} |
+ ${e['offer下发时间'] || '待定'} |
+ ${e['offer下发时间'] ? '已就业' : '待就业'} |
@@ -1594,9 +1594,9 @@
function searchEmployment() {
const keyword = document.getElementById('employment-search').value.toLowerCase();
- const filtered = employmentData.filter(e =>
- (e.sname && e.sname.toLowerCase().includes(keyword)) ||
- (e.company_name && e.company_name.toLowerCase().includes(keyword))
+ const filtered = employmentData.filter(e =>
+ ((e['学生姓名'] && e['学生姓名'].toLowerCase().includes(keyword)) ||
+ (e['公司'] && e['公司'].toLowerCase().includes(keyword)))
);
renderEmployment(filtered);
}
diff --git a/seed_data.py b/seed_data.py
index 688955a..b8d85f4 100644
--- a/seed_data.py
+++ b/seed_data.py
@@ -150,12 +150,12 @@ def seed_test_data():
education, class_id, advisor_id, phone, is_deleted)
VALUES (:num, :name, :age, :sex, :home_Place, :college,
:specialty, :enrollment_time, :graduate_time,
- '本科', :class_id, :advisor_id, :phone, 0)
+ 'ben', :class_id, :advisor_id, :phone, 0)
"""), {
"num": f"2024{1001 + i}",
"name": first_names[i],
"age": 18 + (i % 4),
- "sex": "男" if i % 2 == 0 else "女",
+ "sex": "m" if i % 2 == 0 else "f",
"home_Place": home_places[i % 8],
"college": colleges[i % 8],
"specialty": specialties[i % 4],
diff --git a/stu_jiuye/dao.py b/stu_jiuye/dao.py
index d050af3..95914eb 100644
--- a/stu_jiuye/dao.py
+++ b/stu_jiuye/dao.py
@@ -85,7 +85,7 @@ def get_emp_dao( #获取学生
# ,page
# ,page_size
): #根据选择条件获取信息
- q = (db.query(Employments,Company.employment_company,Address.somewhere)
+ q = (db.query(Employments, Students.name, 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)
@@ -118,17 +118,17 @@ def get_emp_dao( #获取学生
r= q.all()
if r:
return [ {"id": i.id,
- '学生姓名':sname,
+ '学生姓名':sname or '-',
'学生班级编号':i.class_id,
"公司": employment_company or '未就业',
"公司区域":somewhere or '-',
"薪资":i.employment_salary or '-',
- "就业开放时间":i.employment_open_time.strftime('%Y-%m-%d') ,
- "offer下发时间":i.offer_recived_time.strftime('%Y-%m-%d')
+ "就业开放时间":i.employment_open_time.strftime('%Y-%m-%d') if i.employment_open_time else '-',
+ "offer下发时间":i.offer_recived_time.strftime('%Y-%m-%d') if i.offer_recived_time else '-'
# , "创建时间": i.create_time,
# "更新时间": i.update_time,
# "是否删除":i.is_deleted
- } for i,sname,employment_company in r ] #返回信息列表
+ } for i,sname,employment_company,somewhere in r ] #返回信息列表
return {"code": 200, "totals": len(r), "data": r}
def delete_emp_dao(id,db): #删除函数
diff --git a/students/schema/students_request.py b/students/schema/students_request.py
index a92453c..6f658ca 100644
--- a/students/schema/students_request.py
+++ b/students/schema/students_request.py
@@ -1,6 +1,6 @@
# students_schema：请求、响应的模型框架
-from pydantic import BaseModel , Field , field_validator
+from pydantic import BaseModel , Field
from datetime import datetime
import enum
|