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

dev_ec
jingquan huang 5 years ago
commit e1cef3f932

@ -104,7 +104,7 @@ class Poll < ApplicationRecord
status = 4 status = 4
else else
if user.present? && user.student_of_course?(course) if user.present? && user.student_of_course?(course)
ex_time = get_poll_times(user_id,false) ex_time = get_poll_times(user.id,false)
pb_time = ex_time[:publish_time] pb_time = ex_time[:publish_time]
ed_time = ex_time[:end_time] ed_time = ex_time[:end_time]
if pb_time.present? && ed_time.present? && pb_time <= Time.now && ed_time > Time.now if pb_time.present? && ed_time.present? && pb_time <= Time.now && ed_time > Time.now

Loading…
Cancel
Save