From 4075bfc269eeb2b501adb09eaa8fa03e95e42748 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 25 Nov 2019 18:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=9A=84=E7=AD=94=E9=A2=98?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3=E4=B8=8E=E7=8A=B6=E6=80=81=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/polls_helper.rb | 2 +-
 app/models/poll.rb          | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/helpers/polls_helper.rb b/app/helpers/polls_helper.rb
index 866d28254..7ae4470e2 100644
--- a/app/helpers/polls_helper.rb
+++ b/app/helpers/polls_helper.rb
@@ -77,7 +77,7 @@ module PollsHelper
       ex_pb_time = poll.get_poll_times(user.id,false)
       poll_publish_time = ex_pb_time[:publish_time]
       poll_end_time = ex_pb_time[:end_time]
-      current_status = poll.check_user_votes_status(user)
+      current_status = poll.check_user_votes_status(user, poll_status)
       lock_icon = 0  #不显示锁图标
     else
       poll_users_list = poll.get_poll_exercise_users
diff --git a/app/models/poll.rb b/app/models/poll.rb
index 9cb860f61..f3a16198c 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -146,12 +146,15 @@ class Poll < ApplicationRecord
   end
 
   #判断当前用户的答题状态
-  def check_user_votes_status(user)
+  def check_user_votes_status(user, poll_status)
     poll_answer_user = poll_users.where(user_id: user.id).select(:start_at,:end_at,:commit_status)
     user_status = 2
     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
+      user_status = user_status == 1 ? 1 : 4
+    end
     user_status
   end