问卷调整

app/controllers/polls_controller.rb

@@ -198,14 +198,14 @@ class PollsController < ApplicationController
   def common_header
     ActiveRecord::Base.transaction do
       begin
+        @poll_status = @poll.get_poll_status(current_user)
         if @user_course_identity > Course::ASSISTANT_PROFESSOR
           @is_teacher_or = 0
-          @user_poll_answer = @poll.check_user_votes_status(current_user)
+          @user_poll_answer = @poll.check_user_votes_status(current_user, @poll_status)
         else
           @is_teacher_or = 1
           @user_poll_answer = 3  #教师页面
         end
-        @poll_status = @poll.get_poll_status(current_user)
         poll_id_array = [@poll.id]
         @poll_publish_count = get_user_permission_course(poll_id_array,2).count   #是否存在已发布的
         @poll_unpublish_count = get_user_permission_course(poll_id_array,1).count  #是否存在未发布的

app/models/poll.rb

@@ -152,7 +152,14 @@ class Poll < ApplicationRecord
     if poll_answer_user.exists? && (poll_answer_user.first&.start_at.present? || poll_answer_user.first&.end_at.present?)   #学生有过答题的,或者立即截止，但学生未做试卷的
       user_status = poll_answer_user.first.commit_status
     end
+    # 问卷已截止时学生的答题状态需要考虑问卷的状态
     if poll_status > 2
+      # 问卷如果还是继续答题状态则自动提交
+      if user_status = 0
+        poll_end_time = get_poll_times(user.id,false)
+        poll_answer_user.first.update_attributes!(:commit_status => 1, :end_at => poll_end_time)
+        user_status = 1
+      end
       user_status = user_status == 1 ? 1 : 4
     end
     user_status