diff --git a/lib/tasks/poll_publish.rake b/lib/tasks/poll_publish.rake index a964babdc..8cec43565 100644 --- a/lib/tasks/poll_publish.rake +++ b/lib/tasks/poll_publish.rake @@ -83,7 +83,7 @@ namespace :poll_publish do end task :end => :environment do - puts "--------------------------------poll_publish end start" + #1.统一设置的截止 polls = Poll.includes(:poll_users).where("polls_status = 2 AND unified_setting = true AND end_time <=?",Time.now + 900) polls.each do |poll| @@ -93,16 +93,12 @@ namespace :poll_publish do #2.分班设置的截止 polls = Poll.includes(:poll_users).where("polls_status = 2 AND unified_setting = false AND end_time > ?",Time.now + 900) - puts "--------------unified_setting_poll_ids------------------#{polls.pluck(:id)}" - poll_ids = polls.blank? ? "(-1)" : "(" + polls.map(&:id).join(",") + ")" polls_group_settings = PollGroupSetting.where("end_time <= '#{Time.now}' and poll_id in #{poll_ids}") polls_group_settings.each do |poll_setting| poll = poll_setting.poll if poll&.end_time <= Time.now - poll.update_column('polls_status', 3) - puts "########__________________############{poll.polls_status}" end users = poll.course.course_members.where(course_group_id: poll_setting.course_group_id) poll.poll_users.where(user_id: users.pluck(:user_id)).where("commit_status = 0 and start_at is not null").update_all(commit_status: 1, end_at: Time.now) @@ -111,10 +107,7 @@ namespace :poll_publish do # poll_user.update_attributes(:commit_status => 1, :end_at => Time.now) # end # end - end - puts "--------------------------------poll_publish end end" - # PollGroupSetting.where("end_time < ? and end_time > ?", Time.now + 1800, Time.now - 1800).each do |poll_setting| # poll = poll_setting.poll