From 54e05f98f0bd293d97a32a047a0cd98bd08909b4 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 26 Oct 2019 18:52:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=9A=84=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/poll_publish.rake | 51 +++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/lib/tasks/poll_publish.rake b/lib/tasks/poll_publish.rake
index 8cec43565..4fe5e1346 100644
--- a/lib/tasks/poll_publish.rake
+++ b/lib/tasks/poll_publish.rake
@@ -85,42 +85,43 @@ namespace :poll_publish do
   task :end => :environment do
 
     #1.统一设置的截止
-    polls = Poll.includes(:poll_users).where("polls_status = 2 AND unified_setting = true AND end_time <=?",Time.now + 900)
+    polls = Poll.includes(:poll_users).where("polls_status = 2 AND end_time <=?",Time.now + 900)
     polls.each do |poll|
       poll.update_column('polls_status', 3)
-      poll.poll_users.where("commit_status = 0 and start_at is not null").update_all(commit_status: 1, end_at: Time.now)
+      poll.poll_users.where("commit_status = 0 and start_at is not null").update_all(commit_status: 1, end_at: poll.end_time) if poll.unified_setting
     end
 
     #2.分班设置的截止
-    polls = Poll.includes(:poll_users).where("polls_status = 2 AND unified_setting = false AND end_time > ?",Time.now + 900)
-    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|
+    # polls = Poll.includes(:poll_users).where("polls_status = 2 AND unified_setting = false AND end_time > ?",Time.now + 900)
+    # 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)
+    #   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)
+    #   # poll_users.each do |poll_user|
+    #   #   if poll_user.commit_status == 0 && !poll_user.start_at.nil?
+    #   #     poll_user.update_attributes(:commit_status => 1, :end_at => Time.now)
+    #   #   end
+    #   # end
+    # end
+
+    PollGroupSetting.where("end_time < ? and end_time > ?", Time.now + 1800, Time.now - 1800).each do |poll_setting|
       poll = poll_setting.poll
-      if poll&.end_time <= Time.now
-        poll.update_column('polls_status', 3)
-      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)
+      # poll.update_column('polls_status',3)
+
+      users = poll.course.course_members.where(:course_group_id => poll_setting.course_group_id)
+      poll_users = poll.poll_users.where(:user_id => users.map(&:user_id))
+
+      poll_users.where("commit_status = 0 and start_at is not null").update_all(commit_status: 1, end_at: poll_setting.end_time)
       # poll_users.each do |poll_user|
       #   if poll_user.commit_status == 0 && !poll_user.start_at.nil?
       #     poll_user.update_attributes(:commit_status => 1, :end_at => Time.now)
       #   end
       # end
     end
-
-    # PollGroupSetting.where("end_time < ? and end_time > ?", Time.now + 1800, Time.now - 1800).each do |poll_setting|
-    #   poll = poll_setting.poll
-    #   poll.update_column('polls_status',3)
-    #
-    #   users = poll.course.course_members.where(:course_group_id => poll_setting.course_group_id)
-    #   poll_users = poll.poll_users.where(:user_id => users.map(&:user_id))
-    #
-    #   poll_users.each do |poll_user|
-    #     if poll_user.commit_status == 0 && !poll_user.start_at.nil?
-    #       poll_user.update_attributes(:commit_status => 1, :end_at => Time.now)
-    #     end
-    #   end
-    # end
   end
 end

From db2f05111a500c2417a56e57663b19fcd0bad21a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 26 Oct 2019 18:56:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/App.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/App.js b/public/react/src/App.js
index 5988d3532..e4cd6a732 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -486,7 +486,7 @@ class App extends Component {
 							{/*/!*众包创新*!/*/}
 							{/*<Route path={"/crowdsourcing"} component={ProjectPackages}/>*/}
 							{/*竞赛*/}
-							<Route path={"/newcompetitions"}
+							<Route path={"/competitions"}
 										 render={
 											 (props) => {