diff --git a/app/controllers/ecs/evaluations_controller.rb b/app/controllers/ecs/evaluations_controller.rb index 18a78e1c9..d801e13c4 100644 --- a/app/controllers/ecs/evaluations_controller.rb +++ b/app/controllers/ecs/evaluations_controller.rb @@ -5,6 +5,7 @@ class Ecs::EvaluationsController < Ecs::CourseBaseController render_ok( course_targets: service.course_targets, course_achievement: service.course_achievement, + course_rate: service.course_rate, graduation_subitem_evaluations: service.graduation_subitem_evaluations, score_levels_map: service.score_levels_map ) diff --git a/app/services/ecs/query_course_evaluation_service.rb b/app/services/ecs/query_course_evaluation_service.rb index fd1619076..3e23f260e 100644 --- a/app/services/ecs/query_course_evaluation_service.rb +++ b/app/services/ecs/query_course_evaluation_service.rb @@ -4,6 +4,7 @@ class Ecs::QueryCourseEvaluationService < ApplicationService def initialize(ec_course) @ec_course = ec_course @_course_achievement = 0 + @_course_rate = 0 end def course_targets @@ -16,6 +17,12 @@ class Ecs::QueryCourseEvaluationService < ApplicationService @_course_achievement.round(2) end + def course_rate + course_targets + + @_course_rate.round(2) + end + def graduation_subitem_evaluations student_scores = ec_course.ec_course_student_scores.joins(ec_student_score_targets: :ec_course_target).group(:ec_course_target_id) student_scores = student_scores.select('AVG(score) as average_score, ec_course_target_id') @@ -96,6 +103,7 @@ class Ecs::QueryCourseEvaluationService < ApplicationService # 计算总评成绩 @_course_achievement += data[:average_score].to_f * course_target.weight.to_f + @_course_rate += course_target.weight.to_f # 计算学生成绩分布区间 student_count = 0 diff --git a/app/views/admins/schools/shared/_list.html.erb b/app/views/admins/schools/shared/_list.html.erb index 74df29cee..b1453f1a1 100644 --- a/app/views/admins/schools/shared/_list.html.erb +++ b/app/views/admins/schools/shared/_list.html.erb @@ -7,7 +7,7 @@ 单位名称 地区 城市 - 详细地址 + 详细地址 <%= sort_tag('用户数', name: 'users_count', path: admins_schools_path) %> 部门数 <%= sort_tag('创建时间', name: 'created_at', path: admins_schools_path) %>