test四轮完成的版本，加入老师后，在班级模块能搜到，解除了班级模块的注释，并做了一定改动

dao/wl_class_dao.py

@@ -3,8 +3,7 @@ from model.wl_class_model import Class_
 from model.wl_student_model import Student
 from fastapi import HTTPException
 
-# 老师模块加入后解除注释
+from model.wl_teacher_model import Teacher
-# from model.teacher import WlTeacher
 
 
 # 1. 新增班级
@@ -22,29 +21,29 @@ def get_classes(db: Session, skip: int = 0, limit: int = 100):
     class_list = db.query(Class_).filter(Class_.is_deleted == 0).offset(skip).limit(limit).all()
     #下面的部分等导入老师模块后解除注释
     # # 循环每个班级，去老师表里找对应的老师
-    # for c in class_list:
+    for c in class_list:
-    #     # 找班主任（role是"班主任"的第一个老师）
+        # 找班主任（role是"班主任"的第一个老师）
-    #     head_teacher = db.query(WlTeacher).filter(
+        head_teacher = db.query(Teacher).filter(
-    #         WlTeacher.class_id == c.class_id,
+            Teacher.class_id == c.class_id,
-    #         WlTeacher.role == "班主任"
+            Teacher.role == "班主任",
-    #     ).first()
+            Teacher.is_deleted == 0
-    #
+        ).first()
-    #     # 找授课老师（可能有多个，用逗号拼起来）
+
-    #     course_teachers = db.query(WlTeacher).filter(
+        # 找授课老师（可能有多个，用逗号拼起来）
-    #         WlTeacher.class_id == c.class_id,
+        course_teachers = db.query(Teacher).filter(
-    #         WlTeacher.role == "任课"
+            Teacher.class_id == c.class_id,
-    #     ).all()
+            Teacher.role == "任课",
-    #
+            Teacher.is_deleted == 0
-    #     # 把查到的名字塞给班级对象，方便传给前端
+        ).all()
-    #     c.head_teacher_name = head_teacher.t_name if head_teacher else "暂无"
+
-    #     # 下面这两行是初学者常用的拼接字符串写法
+        # 把查到的名字塞给班级对象，方便传给前端
-    #     if course_teachers:
+        c.head_teacher_name = head_teacher.t_name if head_teacher else "暂无"
-    #         names = []
+        # 下面这两行是初学者常用的拼接字符串写法（代码改了，这里的注释没动）
-    #         for t in course_teachers:
+        if course_teachers:
-    #             names.append(t.t_name)
+            names = [t.t_name for t in course_teachers]
-    #         c.course_teacher_names = "，".join(names)
+            c.course_teacher_names = "，".join(names)
-    #     else:
+        else:
-    #         c.course_teacher_names = "暂无"
+            c.course_teacher_names = "暂无"
 
     return class_list
 
@@ -82,11 +81,14 @@ def delete_class(db: Session, class_id: int):
     ).first()
     if student:
         raise HTTPException(status_code=400, detail="该班级还有学生，不能删除！")
-    #导入老师模块后解除注释
+    #解除注释后做了改动
     # 检查2：班里还有老师吗？
-    # teacher = db.query(WlTeacher).filter(WlTeacher.class_id == class_id).first()
+    teacher = db.query(Teacher).filter(
-    # if teacher:
+        Teacher.class_id == class_id,
-    #     return {"code": 400, "msg": "该班级还有老师，不能删除！"}
+        Teacher.is_deleted == 0
+    ).first()
+    if teacher:
+        raise HTTPException(status_code=400, detail="该班级还有老师，不能删除！")
 
     # 检查通过，开始逻辑删除（贴个已删除标签）
     db_class.is_deleted = 1

main.py

@@ -3,8 +3,7 @@ from fastapi import FastAPI
 # 周学灵、熊浩钦、圣国伟、刘盼的路由
 from api import wl_student_api,wl_class_api,wl_score_api,wl_teacher_api
 from database import Base, engine
-from model import wl_student_model as student_model
+from model import wl_student_model,wl_class_model,wl_advisor_model,wl_score_model,wl_teacher_model
-from model import wl_class_model,wl_advisor_model,wl_score_model,wl_teacher_model
 
 
 Base.metadata.create_all(bind=engine)