Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/exercises_controller.rb

@@ -1084,14 +1084,23 @@ class ExercisesController < ApplicationController
           @shixun_undo = 0
           @ques_undo = 0
           ex_answer_time = @exercise.time.to_i
+          if ex_answer_time > 0  #有剩余时间的时候
+            user_left_time = get_exercise_left_time(@exercise,current_user)
+            @ex_end_time = Time.now + user_left_time.to_i.seconds
+          else
             @ex_end_time = @exercise.get_exercise_end_time(current_user.id)
-          if ex_answer_time > 0
-            exercise_end_time = @exercise.exercise_users.exercise_commit_users(current_user.id)
-            if exercise_end_time.present?
-              ex_end_times =  exercise_end_time.first.start_at.nil? ? Time.now : exercise_end_time.first.start_at
-              @ex_end_time = ex_end_times + ex_answer_time.minutes
-            end
           end
+          # @ex_end_time = @exercise.get_exercise_end_time(current_user.id)
+          # if ex_answer_time > 0
+          #   left_answer_time = Time.now + ex_answer_time.minutes  #判断试卷的倒计时和截止时间哪个先到
+          #   if left_answer_time < @ex_end_time
+          #     exercise_end_time = @exercise.exercise_users.exercise_commit_users(current_user.id)
+          #     if exercise_end_time.present?
+          #       ex_end_times =  exercise_end_time.first.start_at.nil? ? Time.now : exercise_end_time.first.start_at
+          #       @ex_end_time = ex_end_times + ex_answer_time.minutes
+          #     end
+          #   end
+          # end
           @exercise_questions.each do |q|
             if q.question_type == Exercise::PRACTICAL  #当为实训题时
               user_myshixun = q.shixun.myshixuns.search_myshixun_user(current_user.id)

app/helpers/exercises_helper.rb

@@ -142,6 +142,9 @@ module ExercisesHelper
         right_users_count = 0
         #该问题的正确率
         if ex.question_type == Exercise::MULTIPLE  #多选题
+          if standard_answer.size == 1  #以前的多选题答案存在一个表里
+            standard_answer = standard_answer.first.to_s.split("").map(&:to_i)
+          end
           right_user_ids = user_ids
           standard_answer.each do |choice_position|
             standard_answer_choice_id = ex_choices.select{|ec| ec.choice_position == choice_position}.first&.id
@@ -896,7 +899,8 @@ module ExercisesHelper
     if ex_time > 0
       exercise_user = exercise.exercise_users.find_by(user_id:user.id)
       time_mill = ex_time * 60   #转为秒
-      exercise_end_time = exercise.end_time.present? ? exercise.end_time.to_i : 0
+      exercise_end_time = exercise.get_exercise_end_time(user.id)  #没有考虑分班的情况
+      # exercise_end_time = exercise.end_time.present? ? exercise.end_time.to_i : 0
       exercise_user_start = exercise_user&.start_at.present? ? exercise_user.start_at.to_i : 0
       #用户未开始答题时，即exercise_user_start为0
       if exercise_user_start == 0