试卷填空题的问题

app/helpers/exercises_helper.rb

@@ -112,43 +112,44 @@ module ExercisesHelper
 
       effictive_users_count = effictive_users.size #有效回答数，可能有重复的用户id，这里仅统计是否回答这个问题的全部人数
       #
-      # if ex.question_type > Exercise::COMPLETION  #当为主观题和实训题时，
+      if ex.question_type > Exercise::COMPLETION  #当为主观题和实训题时，
-      #   ex_answered_scores = effictive_users.score_reviewed.pluck(:score).sum  #该问题的全部得分
-      #   percent = (ex_total_score == 0.0 ? 0.0 : (ex_answered_scores / ex_total_score.to_f).round(3) * 100)  #正确率
-      #
-      # end
-
-      if ex.question_type != Exercise::MULTIPLE
         ex_answered_scores = effictive_users.score_reviewed.pluck(:score).sum  #该问题的全部得分
         percent = (ex_total_score == 0.0 ? 0.0 : (ex_answered_scores / ex_total_score.to_f).round(3) * 100)  #正确率
-      else
-        multiple_score = 0
-        user_ids.each do |user_id|
-          ex_answer_score = ex_answers.select{|answer| answer.user_id == user_id}&.first&.score.to_f
-          multiple_score += ex_answer_score
-        end
-
-        percent = (ex_total_score == 0.0 ? 0.0 : (multiple_score / ex_total_score.to_f).round(3) * 100)  #正确率
 
       end
 
+      # if ex.question_type != Exercise::MULTIPLE
+      #   ex_answered_scores = effictive_users.score_reviewed.pluck(:score).sum  #该问题的全部得分
+      #   percent = (ex_total_score == 0.0 ? 0.0 : (ex_answered_scores / ex_total_score.to_f).round(3) * 100)  #正确率
+      # else
+      #   multiple_score = 0
+      #   user_ids.each do |user_id|
+      #     ex_answer_score = ex_answers.select{|answer| answer.user_id == user_id}&.first&.score.to_f
+      #     multiple_score += ex_answer_score
+      #   end
+      #   percent = (ex_total_score == 0.0 ? 0.0 : (multiple_score / ex_total_score.to_f).round(3) * 100)  #正确率
+      # end
+
       question_answer_infos = []
       if ex.question_type <= Exercise::JUDGMENT  #选择题和判断题
         ex_choices = ex.exercise_choices
         standard_answer = ex.exercise_standard_answers.pluck(:exercise_choice_id).sort   #标准答案的位置
-        # right_users_count = 0
+        right_users_count = 0
-        # 该问题的正确率
+        #该问题的正确率
-        # if ex.question_type == Exercise::MULTIPLE  #多选题
+        if ex.question_type == Exercise::MULTIPLE  #多选题
-        #   right_user_ids = user_ids
+          right_user_ids = user_ids
-        #   standard_answer.each do |choice_position|
+          standard_answer.each do |choice_position|
-        #     standard_answer_choice_id = ex_choices.select{|ec| ec.choice_position == choice_position}.first&.id
+            standard_answer_choice_id = ex_choices.select{|ec| ec.choice_position == choice_position}.first&.id
-        #     right_user_ids = right_user_ids & effictive_users.select{|answer| answer.exercise_choice_id == standard_answer_choice_id}.pluck(:user_id)
+            right_user_ids = right_user_ids & effictive_users.select{|answer| answer.exercise_choice_id == standard_answer_choice_id}.pluck(:user_id)
-        #   end
+          end
-        #   # right_users_count = right_user_ids.size
+          right_users_count = right_user_ids.size
-        # else  #单选题和判断题
+          right_users_scores = right_users_count * ex&.question_score.to_f
-        #   standard_answer_choice_id = ex_choices.select{|ec| ec.choice_position == standard_answer.first}.first&.id
+        else  #单选题和判断题
-        #   # right_users_count = effictive_users.select{|answer| answer.exercise_choice_id == standard_answer_choice_id}.size
+          standard_answer_choice_id = ex_choices.select{|ec| ec.choice_position == standard_answer.first}.first&.id
-        # end
+          right_users_count = effictive_users.select{|answer| answer.exercise_choice_id == standard_answer_choice_id}.size
+          right_users_scores = right_users_count * ex&.question_score.to_f
+        end
+        percent = (ex_total_score == 0.0 ? 0.0 : (right_users_scores / ex_total_score.to_f).round(3) * 100)  #正确率
 
         # percent = commit_user_ids > 0 ? (right_users_count / commit_user_ids.to_f).round(3)*100 : 0.0
 
@@ -174,6 +175,7 @@ module ExercisesHelper
         null_stand_choice = null_standard_answer.pluck(:exercise_choice_id)  #一个exercise_choice_id可能对应多个answer_text
         null_stand_text = null_standard_answer.pluck(:answer_text)
         standard_answer_count = 0
+        each_null_score = null_stand_choice.size > 0 ? (ex&.question_score.to_f / null_stand_choice.size).round(3) : 0.0
         all_user_count = 0
         null_stand_choice.each_with_index do |s,index|
           user_count = 0
@@ -196,6 +198,9 @@ module ExercisesHelper
           all_user_count += user_count
           standard_answer_count += 1
         end
+        answer_user_score = all_user_count * each_null_score
+        percent = (ex_total_score == 0.0 ? 0.0 : (answer_user_score / ex_total_score.to_f).round(3) * 100)  #正确率
+
         # percent = commit_user_ids > 0 ? (all_user_count / commit_user_ids.to_f).round(3)*100 : 0.0
 
         user_wrong_count = (effictive_users_count - all_user_count )