统计分析模块更新，待测试，统计分析模块更新，就业3个模块更新。

StatCalc/api/statcalc_api.py

@@ -44,11 +44,8 @@ def get_students(db=Depends(get_db)):
     ,summary='不及格成绩查询'
     ,description=f'查询有两次以上不及格的学生的姓名，班级和不及格成绩。'
                   )
-def get_students( stu:StudentsQuery = Depends()
-                 , db=Depends(get_db)
-                  ):
-    s_dict = stu.model_dump(exclude_unset=True) # 没值的不要
-    result = get_student_dao( s=s_dict , db=db )
+def get_students( db=Depends(get_db)  ):
+    result = get_score_80( db=db )
     if result:
         return result
     raise HTTPException(status_code=404, detail="没有找到符合条件的学生")
@@ -66,47 +63,10 @@ def get_students( stu:StudentsQuery = Depends()
         return result
     raise HTTPException(status_code=404, detail="没有找到符合条件的学生")
 
-@statcalc_api.get("/statcalc"
-    ,summary='排名前五的学生信息'
-    ,description=f'统计就业薪资最高的前五名学生的姓名，班级和就业时间，就业公司。'
-                  )
-def get_students( stu:StudentsQuery = Depends()
-                 , db=Depends(get_db)
-                  ):
-    s_dict = stu.model_dump(exclude_unset=True) # 没值的不要
-    result = get_student_dao( s=s_dict , db=db )
-    if result:
-        return result
-    raise HTTPException(status_code=404, detail="没有找到符合条件的学生")
 
-@statcalc_api.get("/statcalc"
-    ,summary='就业时长统计'
-    ,description=f'统计每个学生的就业时长（offer下发时间-就业开放时间）。'
-                  )
-def get_students( stu:StudentsQuery = Depends()
-                 , db=Depends(get_db)
-                  ):
-    s_dict = stu.model_dump(exclude_unset=True) # 没值的不要
-    result = get_student_dao( s=s_dict , db=db )
-    if result:
-        return result
-    raise HTTPException(status_code=404, detail="没有找到符合条件的学生")
+from stu_jiuye.model import *
 
-@statcalc_api.get("/statcalc"
-    ,summary='班级的平均就业时长'
-    ,description=f'统计每个班级的平均就业时长（只统计进入就业阶段的学生，也就是有就业开放时间）'
-                  )
-def get_students( stu:StudentsQuery = Depends()
-                 , db=Depends(get_db)
-                  ):
-    s_dict = stu.model_dump(exclude_unset=True) # 没值的不要
-    result = get_student_dao( s=s_dict , db=db )
-    if result:
-        return result
-    raise HTTPException(status_code=404, detail="没有找到符合条件的学生")
-
-
-@CURD.get('/Top5',summary='就业薪资Top5')
+@statcalc_api.get('/Top5',summary='就业薪资Top5')
 def salarytop5(db=Depends(get_db)):
     q = db.query(Employments,Company.employment_company) \
     .join(Company, Employments.company_id == Company.id) \
@@ -115,16 +75,19 @@ def salarytop5(db=Depends(get_db)):
     .limit(5) .all()
     return [{'学生姓名':i.sname,'学生班级编号':i.class_num,'就业时间':i.offer_recived_time,'公司':employment_company} for i,employment_company in q]
 
-@CURD.get('/worktime',summary='学生就业时常')
+@statcalc_api.get('/worktime',summary='学生就业时长')
 def worktime(db=Depends(get_db)):
     q = db.query(Employments)\
         .filter(Employments.is_deleted==0)\
             .all()
 
-    return [{'学生姓名':i.sname,'就业时常':f'{i.offer_recived_time-i.employment_open_time}' if i.offer_recived_time and i.employment_open_time else '暂无数据'} for i in q]
+    return [
+            {'学生姓名':i.sname
+            ,'就业时常':f'{i.offer_recived_time-i.employment_open_time}'
+            if i.offer_recived_time and i.employment_open_time else '暂无数据'} for i in q
+            ]
 
-
-@CURD.get('/avgworktime',summary='学生平均就业时常')
+@statcalc_api.get('/avgworktime',summary='学生平均就业时长')
 def avgworktime(db=Depends(get_db)):
     q = db.query(Employments)\
         .filter(Employments.employment_open_time.isnot(None)
@@ -139,3 +102,4 @@ def avgworktime(db=Depends(get_db)):
         '人数': len(q),
         '平均就业时常(天)': round(avg_days, 2)
     }
+

StatCalc/dao/statcalc_dao.py

@@ -39,12 +39,23 @@ def get_class_count(g , db):
 from scores.model.score_model import Score
 
 def get_score_80(db):
-    q = ( db.query(Score)
-          .group_by(Score.score)
-          .having( min(Score.score) >= 80)
+    sq = ( db.query(Students.id)
+           .join(Score, Score.sid == Students.id)
+           .filer(Score.score < 80 )
+           .group_by(Students.id)
+           .having(func.count(Score.id) > 2 )
+           .sq()
+         )
+
+    q = ( db.query(Students.name,ClassInfo.name,Score.score )
+          .join(ClassInfo, ClassInfo.id == Students.class_id)
+          .join(Score, Score.sid == Students.id)
+          .filer(Students.id.in_(sq),Score.score < 80)
           .all()
          )
     return q
 
 
 
+
+