试卷

app/controllers/exercises_controller.rb

@@ -1190,10 +1190,18 @@ class ExercisesController < ApplicationController
 
       @exercise_users_size = @exercise_users_list.size
 
+      if @exercise.time > 0
+        start_time = Time.current - @exercise.time * 60
+        if @exercise_users_list.where("start_at <= '#{Time.at(start_time)}' and commit_status = 0").count > 0
+
+        end
+      end
+
       # 分页
       @page = params[:page] || 1
       @limit = params[:limit] || 20
       @exercise_users_list = @exercise_users_list.page(@page).per(@limit)
+
     else
       @exercise_users_list = []
       @export_ex_users = @exercise_users_list

app/helpers/exercises_helper.rb

@@ -971,15 +971,16 @@ module ExercisesHelper
     if commit_time.nil?
       if exercise.time > 0
         start_time = Time.at(exercise_user.start_at + exercise.time * 60)
-        commit_time = start_time > exercise_end_time ? exercise_end_time : start_time
+        end_time = start_time > exercise_end_time ? exercise_end_time : start_time
         commit_method = start_time > exercise_end_time ? 3 : 2
       else
         commit_method = 3
-        commit_time = exercise_end_time
+        end_time = exercise_end_time
       end
     else
       commit_method = 1
     end
+    commit_time = commit_time.present? && end_time > commit_time ? commit_time : end_time
 
     commit_option = {
       :status => 1,