试卷，问卷的状态修改

app/models/exercise.rb

@@ -127,8 +127,10 @@ class Exercise < ApplicationRecord
 
   #判断是否为分班，如果分班，试卷的截止时间为当前分班时间，否则为试卷的截止时间
   def get_exercise_status(user)
-    return Exercise::UNPUBLISHED if user.nil?
-    if user.student_of_course?(course)   #当为学生的时候,需根据分班来判断试卷状态
+    if course.end_time.present? && course.end_time <= Time.now
+      status = 4
+    else
+      if user.present? && user.student_of_course?(course)   #当为学生的时候,需根据分班来判断试卷状态
         ex_time = get_exercise_times(user_id,false)
         pb_time = ex_time[:publish_time]
         ed_time = ex_time[:end_time]
@@ -142,6 +144,8 @@ class Exercise < ApplicationRecord
       else
         status = exercise_status   #当为老师的时候，则为试卷的总状态
       end
+    end
+
     status
   end
 

app/models/poll.rb

@@ -100,11 +100,16 @@ class Poll < ApplicationRecord
   end
 
   def get_poll_status(user)
-    if user.student_of_course?(course)
+    if course.end_time.present? && course.end_time <= Time.now
+      status = 4
+    else
+      if user.present? && user.student_of_course?(course)
         ex_time = get_poll_times(user_id,false)
         pb_time = ex_time[:publish_time]
         ed_time = ex_time[:end_time]
-      if pb_time.present? && ed_time.present? && pb_time <= Time.now && ed_time > Time.now
+        if course.end_time.present? && course.end_time <= Time.now
+          status = 4
+        elsif pb_time.present? && ed_time.present? && pb_time <= Time.now && ed_time > Time.now
           status = 2
         elsif ed_time.present? && ed_time <= Time.now
           status = 3
@@ -114,6 +119,7 @@ class Poll < ApplicationRecord
       else
         status  = polls_status
       end
+    end
     status
   end