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

PythonProject/api/statistics_api.py

@@ -8,7 +8,6 @@ StatisticsAPI = APIRouter()
 @StatisticsAPI.get("/age",response_model=list[StudentResponse],tags=['统计分析模块'],description='根据年龄查询学生信息')
 def get_students(min_age:int|None=None,max_age:int|None=None,db=Depends(get_db)):
     l = select_age(min_age,max_age,db)
-    print(l)
     return l
 
 @StatisticsAPI.get("/all",response_model=StudentResponse,tags=['统计分析模块'],description='统计每个班级的学员总数和男女生总数')

PythonProject/api/student_api.py

@@ -6,7 +6,7 @@ from util.database import get_db
 
 StudentAPI = APIRouter()
 
-@StudentAPI.get('/',description='查询学生信息')
+@StudentAPI.get('/',tags=['学⽣基本信息管理模块'],description='查询学生信息')
 def get_students(stu_id:int|None=None
                 ,stu_name:str|None=None
                 ,class_id:int|None=None
@@ -18,7 +18,7 @@ def get_students(stu_id:int|None=None
         return r
     raise HTTPException(status_code=404,detail='学生不存在')
 
-@StudentAPI.put('/{stu_id}')
+@StudentAPI.put('/{stu_id}',tags=['学⽣基本信息管理模块'])
 def update_students(s:StudentRequest
                     ,stu_id:int
                     ,db=Depends(get_db)):
@@ -28,7 +28,7 @@ def update_students(s:StudentRequest
         raise HTTPException(status_code=500, detail='没有更新！')
     return {'code':200,'totals':r,'detail':'更新成功'}
 
-@StudentAPI.delete('/{stu_id}')
+@StudentAPI.delete('/{stu_id}',tags=['学⽣基本信息管理模块'])
 def del_students(stu_id:int
                  ,db=Depends(get_db)):
     rows=delete_student_dao( stu_id=stu_id,db=db )
@@ -36,7 +36,7 @@ def del_students(stu_id:int
         raise HTTPException(status_code=500,detail='没有删除')
     return {'code':200,'totals':rows,'detail':'删除成功'}
 
-@StudentAPI.post('/',response_model=list[StugetResponse])
+@StudentAPI.post('/',tags=['学⽣基本信息管理模块'],response_model=list[StugetResponse])
 def add_students(s:StudentRequest
                  ,db=Depends(get_db)):
     d=s.model_dump(exclude_unset=True)
@@ -45,7 +45,7 @@ def add_students(s:StudentRequest
         raise HTTPException(status_code=500,detail='添加失败')
 
 
-@StudentAPI.put('/')
+@StudentAPI.put('/',tags=['学⽣基本信息管理模块'])
 def get_students(stu_id:int|None = None
                  ,stu_name:str|None = None
                  ,class_id:int|None=None

PythonProject/dao/cla_dao.py

@@ -0,0 +1,85 @@
+from model.all_model import ClassManagement
+from fastapi import HTTPException
+from schema.cla_schema import claRequest
+
+
+def add_class_dao(c:claRequest,session):
+    try:
+        data = c.model_dump()
+        d = ClassManagement(**data)
+        session.add(d)
+    except:
+        session.rollback()
+        return '输入有误，请重新添加班级!'
+    else:
+        session.commit()
+        return '添加成功！'
+
+def get_class_dao(session):
+    try:
+        class_list=session.query(ClassManagement).filter(ClassManagement.delete_status==0).all()
+        return class_list
+    except:
+        raise HTTPException(status_code=406,detail="输入查询信息有误，请重新输入！")
+
+def update_class_dao(id:int,req:ClassManagement,session):
+    try:
+        session.query(ClassManagement).filter(ClassManagement.class_id==id)\
+        .filter(ClassManagement.delete_status==0).update(req.model_dump(exclude_unset=True))
+        session.commit()
+    except:
+        raise HTTPException(status_code=400,detail="更新格式错误或参数缺失，请重新输入！")
+    return '更新成功，请核对信息！'
+
+def delete_class(id:int,session):
+    try:
+        session.query(ClassManagement).filter(ClassManagement.class_id==id,ClassManagement.delete_status==0)\
+        .update({'delete_status': 1})
+        session.commit()
+    except:
+        raise HTTPException(status_code=404, detail="删除异常,请重新核对之后删除！")
+    return '删除成功，请核对信息！'
+
+def get_class_for_delete(id: int, session):
+    try:
+        obj = (
+            session.query(ClassManagement).filter(ClassManagement.class_id == id,ClassManagement.delete_status == 0).first()
+        )
+        if not obj:
+            raise HTTPException(status_code=404, detail="班级不存在")
+    except HTTPException:
+        raise
+    except Exception:
+        raise HTTPException(status_code=500, detail="查询异常，请重新核对！")
+
+    return {
+        "class_id": obj.class_id,
+        "class_name": obj.class_name,
+        "start_class_date": obj.start_class_date,
+        "head_teacher_id": obj.head_teacher_id,
+        "class_teacher_id": obj.class_teacher_id,
+    }
+
+
+def hard_delete_class(id: int, session):
+    try:
+        obj = (
+            session.query(ClassManagement).filter(ClassManagement.class_id == id,ClassManagement.delete_status == 0)
+            .first()
+        )
+        if not obj:
+            raise HTTPException(status_code=404, detail="班级不存在")
+
+        session.delete(obj)
+        session.commit()
+    except HTTPException:
+        raise
+    except Exception:
+        session.rollback()
+        raise HTTPException(status_code=500, detail="删除异常，请重新核对之后删除！")
+
+    return '删除成功，请核对信息！'
+
+
+
+

PythonProject/dao/statistics_dao.py

@@ -13,7 +13,7 @@ def select_age(min_age,max_age,db):
             db = db.filter(Student_Model.age >= min_age,Student_Model.delete_status == 0)
         if max_age is not None:
             db = db.filter(Student_Model.age <= max_age,Student_Model.delete_status == 0)
-        print(db.all())
+        print('abc',db.all())
         return db.all()
     except HTTPException:
         raise
@@ -23,7 +23,7 @@ def select_age(min_age,max_age,db):
 # 实现统计每个班级的学员总数以及男女生的总数的功能
 def select_all(db):
     try:
-        l1 = db.query(Student_Model.class_id,func.count(1)).group_by(Student_Model.class_id,Student_Model.gender).all()
+        l1 = db.query(Student_Model.class_id,Student_Model.gender,func.count(1)).group_by(Student_Model.class_id,Student_Model.gender).all()
         return l1
     except Exception:
         raise HTTPException(status_code=500,detail="查询异常")
@@ -43,4 +43,5 @@ def select_score(min_score,max_score,db):
     except HTTPException:
         raise
     except Exception:
-        raise HTTPException(status_code=500,detail="查询异常")
+        raise HTTPException(status_code=500,detail="查询异常")
+

需求文档.md

@@ -57,7 +57,7 @@ dao层（每一个功能就是一个函数，判断能否功能复用）
 实现统计每个班级的学员总数以及男女生的总数的功能 **mrz 已作成**
 实现根据成绩查询学员信息的功能 **mrz 已作成**
 实现统计每次考试每个班级的平均分并排序的功能 **mrz 做成中**
-实现统计薪资最高的前五名的学员信息 **sgt 做成中**
-实现查询每个学生的就业时长 **xxx 做成中**
+实现统计薪资最高的前五名的学员信息 **mrz 做成中**
+实现查询每个学生的就业时长 **msj 做成中**
 实现统计每个班级的平均就业时长 **xxx 做成中**