fixed 竞赛通知job

app/jobs/competiton_notice_job.rb

@@ -10,7 +10,7 @@ class CompetitionNoticeJob < ApplicationJob
   # "竞赛通知-进入提交作品状态"
   def submit_work_begin
     Rails.logger.info "__________#{Time.now.to_s}__submit_work_begin start______________________"
-    competitions = CompetitionInfo.where("enroll_date >=? and enroll_date <= ? ", (Time.now - 5.minutes).strftime('%Y-%m-%d %H:%M:00'), Time.now.strftime('%Y-%m-%d %H:%M:00'))
+    competitions = CompetitionInfo.where("start_upload_date >=? and start_upload_date <= ? ", Time.now.strftime('%Y-%m-%d %H:%M:00'),(Time.now + 5.minutes).strftime('%Y-%m-%d %H:%M:00'))
     competitions.each do |c|
       competition_users = CompetitionUser.where(competition_info_id: c.id)
       competition_users.each do |team|
@@ -23,7 +23,7 @@ class CompetitionNoticeJob < ApplicationJob
   # "竞赛通知-截止提交作品时间前3天"
   def submit_work_end
     Rails.logger.info "__________#{Time.now.to_s}__submit_work_end start______________________"
-    competitions = CompetitionInfo.where("upload_date >=? and upload_date <= ? ", (Time.now + 3.days - 5.minutes).strftime('%Y-%m-%d %H:%M:00'), Time.now.strftime('%Y-%m-%d %H:%M:00'))
+    competitions = CompetitionInfo.where("upload_date >=? and upload_date <= ? ", (Time.now - 3.days - 5.minutes).strftime('%Y-%m-%d %H:%M:00'), Time.now.strftime('%Y-%m-%d %H:%M:00'))
     competitions.each do |c|
       competition_users = CompetitionUser.where(competition_info_id: c.id)
       competition_users.each do |team|
@@ -36,7 +36,7 @@ class CompetitionNoticeJob < ApplicationJob
   # "竞赛通知-报名的竞赛进入成绩公示阶段"
   def submit_work_result
     Rails.logger.info "__________#{Time.now.to_s}__submit_work_result start______________________"
-    competitions = CompetitionInfo.where("upload_date <?", Time.now)
+    competitions = CompetitionInfo.where("upload_date >=? and upload_date <= ? ", Time.now.strftime('%Y-%m-%d %H:%M:00'), (Time.now + 5.minutes).strftime('%Y-%m-%d %H:%M:00'))
     competitions.each do |c|
       competition_users = CompetitionUser.where(competition_info_id: c.id)
       competition_users.each do |team|

app/models/message_template/competition_begin.rb

@@ -28,7 +28,7 @@ class MessageTemplate::CompetitionBegin < MessageTemplate
 
   # MessageTemplate::FollowedTip.get_message_content(User.where(login: 'yystopf'), User.last)
   def self.get_message_content(receivers, competition)
-    return receivers_string(receivers), sys_notice.to_s.gsub('{competition_name}', competition&.name.to_s), notification_url.to_s.gsub('{to_url}', "/competitions/#{competition.identifier}/home")
+    return receivers_string(receivers), sys_notice.to_s.gsub('{competition_name}', competition&.name.to_s), notification_url.to_s.gsub('{to_url}', "/competitions/#{competition.identifier}")
   # rescue
   #   return '', '', ''
   end

app/models/message_template/competition_result.rb

@@ -28,7 +28,7 @@ class MessageTemplate::CompetitionResult < MessageTemplate
 
   # MessageTemplate::FollowedTip.get_message_content(User.where(login: 'yystopf'), User.last)
   def self.get_message_content(receivers, competition)
-    return receivers_string(receivers), sys_notice.gsub('{competition_name}', competition&.name.to_s), notification_url.gsub('{to_url}', "/competitions/#{competition.identifier}/home")
+    return receivers_string(receivers), sys_notice.gsub('{competition_name}', competition&.name.to_s), notification_url.gsub('{to_url}', "/competitions/#{competition.identifier}")
   rescue 
     return '', '', ''
   end

app/models/message_template/competition_review.rb

@@ -28,7 +28,7 @@ class MessageTemplate::CompetitionReview < MessageTemplate
 
   # MessageTemplate::FollowedTip.get_message_content(User.where(login: 'yystopf'), User.last)
   def self.get_message_content(receivers, competition)
-    return receivers_string(receivers), sys_notice.gsub('{competition_name}', competition&.name.to_s), notification_url.gsub('{to_url}', "/competitions/#{competition.identifier}/home")
+    return receivers_string(receivers), sys_notice.gsub('{competition_name}', competition&.name.to_s), notification_url.gsub('{to_url}', "/competitions/#{competition.identifier}")
   rescue 
     return '', '', ''
   end

config/sidekiq_cron.yml

@@ -40,6 +40,6 @@ sync_competition_tzb_user:
   queue: default
 
 competition_notice:
-  cron: "*/2 * * * *"
+  cron: "*/5 * * * *"
   class: "CompetitionNoticeJob"
   queue: message