From 5a0523bc163301ad9c58dc12aee1444eb99fbacb Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 7 Nov 2019 15:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=9A=84=E4=B8=BB=E8=A7=82?=
 =?UTF-8?q?=E9=A2=98=E3=80=81=E5=AE=A2=E8=A7=82=E9=A2=98=E5=88=86=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/exercise.rb                           | 8 ++++++++
 app/views/exercises/exercise_lists.json.jbuilder | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/app/models/exercise.rb b/app/models/exercise.rb
index 7413853e0..9bc9bd1fb 100644
--- a/app/models/exercise.rb
+++ b/app/models/exercise.rb
@@ -41,6 +41,14 @@ class Exercise < ApplicationRecord
     exercise_questions.pluck(:question_score).sum
   end
 
+  def subjective_score
+    exercise_questions.where(question_type: [4]).pluck(:question_score).sum
+  end
+
+  def objective_score
+    exercise_questions.where(question_type: [0, 1, 2, 3, 5]).pluck(:question_score).sum
+  end
+
   def create_exercise_list
     str = ""
     # TODO: 一次性为所有学生创建数据是否存在问题？
diff --git a/app/views/exercises/exercise_lists.json.jbuilder b/app/views/exercises/exercise_lists.json.jbuilder
index 26723c894..8230ef7c7 100644
--- a/app/views/exercises/exercise_lists.json.jbuilder
+++ b/app/views/exercises/exercise_lists.json.jbuilder
@@ -16,6 +16,8 @@ json.exercise_types do
   json.subjective @subjective_type  #是否包含主观题，1为包括，0为不包括
   json.exercise_end_time ((@ex_user_end_time.nil? || @ex_user_end_time < Time.now) ? "--" : how_much_time(@ex_user_end_time))
   json.groups_count @c_group_counts
+  json.subjective_score @exercise.subjective_score
+  json.objective_score @exercise.objective_score
 end
 
 if @exercise_current_user_status == 0  #当为老师的时候