Merge remote-tracking branch 'origin/conding' into conding

PythonProject/dao/cla_dao.py

@@ -15,9 +15,9 @@ def add_class_dao(c:claRequest,session):
         session.commit()
         return '添加成功！'
 
-def get_class_dao(session):
+def get_class_dao(n,m,session):
     try:
-        class_list=session.query(ClassManagement).filter(ClassManagement.delete_status==0).all()
+        class_list=session.query(ClassManagement).filter(ClassManagement.delete_status==0).offset((n-1)*m).limit(m).all()
         return class_list
     except:
         raise HTTPException(status_code=406,detail="输入查询信息有误，请重新输入！")
@@ -60,7 +60,6 @@ def get_class_for_delete(id: int, session):
         "class_teacher_id": obj.class_teacher_id,
     }
 
-
 def hard_delete_class(id: int, session):
     try:
         obj = (

PythonProject/dao/employment_dao.py

@@ -1,9 +1,9 @@
-from fastapi import HTTPException,Depends
+from fastapi import HTTPException
 from model.all_model import Employment_info, ClassManagement, Student_Model
 from util.database import get_db
 from schema.employment_schema import EmploymentRequest
 
-def get_employment_dao(stu_id,class_id,db=Depends(get_db())):
+def get_employment_dao(stu_id,class_id,db):
     try:
         q = db.query(Employment_info).\
             join(Student_Model,Employment_info.stu_id == Student_Model.stu_id).\
@@ -27,20 +27,19 @@ def get_employment_dao(stu_id,class_id,db=Depends(get_db())):
                     ,'company_name':i.company_name
                     ,'company_address':i.company_address
                     ,'salary':i.salary
-                    }for i in r
+                     }for i in r
                     ]
     except:
         raise HTTPException(status_code=404,detail='信息不存在！')
 
-# def add_employment_dao(e:EmlpoymentRequest,db=Depends(get_db()),stu_id):
-#     try:
-#         r = db.query(Employment_info).filter(Employment_info.stu_id == stu_id).all()
-#         if r:
-#         e1 = Employment_info(**e)
-#         db.add(e1)
-#     except:
-#         db.rollback()
-#         return False
-#     else:
-#         db.commit()
-#         return True
+def add_employment_dao(e:EmploymentRequest,db):
+    try:
+        d = e.model_dump()
+        e1 = Employment_info(**d)
+        db.add(e1)
+    except:
+        db.rollback()
+        raise HTTPException(status_code=404, detail='信息不存在！')
+    else:
+        db.commit()
+        return e1

PythonProject/dao/statistics_dao.py

@@ -91,3 +91,21 @@ def select_days(db):
     except Exception:
         raise HTTPException(status_code=500, detail="查询异常")
 
+#统计每个学⽣的就业时⻓
+def select_days2(db):
+    try:
+        l2 =db.query(
+                     Employment_info.stu_id
+                    ,Employment_info.employment_opening_date
+                    ,Employment_info.offer_issuance_date
+                       ,func.datediff(
+                                      Employment_info.offer_issuance_date
+                                     ,Employment_info.employment_opening_date
+                                     )
+                      .label("employment_duration_day")
+                    ).filter(
+                             Employment_info.delete_status == 0
+                             ).all()
+        return l2
+    except Exception:
+        raise HTTPException(status_code=500, detail="查询异常")

PythonProject/dao/teacher_dao.py

@@ -6,11 +6,8 @@ def add_teacher(teacher,session):
     try:
         print(teacher)
         x=Teacher_Model(**teacher)
-        print(1)
         session.add(x)
-        print(2)
         session.commit()
-        print(3)
         return teacher
     except:
         session.rollback()
@@ -25,19 +22,24 @@ def get_teacher(id,session):
     else:
         raise HTTPException(status_code=404,detail='该老师不存在！')
 
-def update_teacher(teac_id:int,req:Teacher_RequestModel,session):
+def update_teacher(id:int,req,session):
     try:
-        session.query(Teacher_Model).filter(Teacher_Model.teac_id==id)\
-        .filter(Teacher_Model.delete_status==0).update(req.model_dump(exclude_unset=True))
-        session.commit()
+        r=session.query(Teacher_Model).filter(Teacher_Model.teac_id==id) \
+            .filter(Teacher_Model.delete_status==0).update(req)
     except:
-        raise HTTPException(status_code=500,detail="更新异常！")
+        session.rollback()
+        return False
+    else:
+        session.commit()
+        return r
 
 def delete_teacher(id:int,session):
     try:
-        session.query(Teacher_Model).filter(Teacher_Model.teac_id==id,Teacher_Model.delete_status==0)\
+        r=session.query(Teacher_Model).filter(Teacher_Model.teac_id==id,Teacher_Model.delete_status==0)\
             .update({'delete_status':1})
-        session.commit()
     except:
-        raise HTTPException(status_code=500,detail="删除异常")
-    return {'code':200,'details':'删除成功'}
+        session.rollback()
+        return False
+    else:
+        session.commit()
+        return r