From cdcb16705124a1d09b38e59a40dd26ff4a3845fe Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 12 Nov 2019 10:48:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/competition_extra_course_statistic.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/competition_extra_course_statistic.rake b/lib/tasks/competition_extra_course_statistic.rake index 924ca959e..724e53ca2 100644 --- a/lib/tasks/competition_extra_course_statistic.rake +++ b/lib/tasks/competition_extra_course_statistic.rake @@ -56,7 +56,7 @@ namespace :competition do forked_shixun_map = Shixun.where(status: 2, fork_from: shixun_ids).select('id, fork_from') forked_shixun_map = forked_shixun_map.each_with_object({}) { |sx, obj| obj[sx.id] = sx.fork_from } forked_myshixun_count_map = get_valid_myshixun_count(forked_shixun_map.keys) - forked_myshixun_count_map.each { |k, v| myshixun_count_map[forked_shixun_map[k]] += v } + forked_myshixun_count_map.each { |k, v| myshixun_count_map[forked_shixun_map[k]].to_i += v.to_i } course_count_map = get_valid_course_count(shixun_ids, end_time) forked_map = get_valid_course_count(forked_shixun_map.keys, end_time) From 287f48cbfee5323c2062592525c0f8fbe0fd652a Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 12 Nov 2019 10:50:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/competition_extra_course_statistic.rake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/tasks/competition_extra_course_statistic.rake b/lib/tasks/competition_extra_course_statistic.rake index 724e53ca2..76cc706b3 100644 --- a/lib/tasks/competition_extra_course_statistic.rake +++ b/lib/tasks/competition_extra_course_statistic.rake @@ -25,6 +25,8 @@ namespace :competition do users = User.joins(:user_extension).where(id: user_ids).where(user_extensions: {identity: 0}) + competition.competition_teams.destroy_all + users.each do |user| team = CompetitionTeam.create!(competition_id: competition.id, user_id: user.id, name: user.real_name) TeamMember.create!(competition_team_id: team.id, user_id: user.id, role: 1, competition_id: competition.id) From 04929a83d938feb5e41ab321897cf6716393f266 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 12 Nov 2019 10:53:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tasks/competition_extra_course_statistic.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/competition_extra_course_statistic.rake b/lib/tasks/competition_extra_course_statistic.rake index 76cc706b3..c88cb48df 100644 --- a/lib/tasks/competition_extra_course_statistic.rake +++ b/lib/tasks/competition_extra_course_statistic.rake @@ -58,7 +58,7 @@ namespace :competition do forked_shixun_map = Shixun.where(status: 2, fork_from: shixun_ids).select('id, fork_from') forked_shixun_map = forked_shixun_map.each_with_object({}) { |sx, obj| obj[sx.id] = sx.fork_from } forked_myshixun_count_map = get_valid_myshixun_count(forked_shixun_map.keys) - forked_myshixun_count_map.each { |k, v| myshixun_count_map[forked_shixun_map[k]].to_i += v.to_i } + forked_myshixun_count_map.each { |k, v| myshixun_count_map[forked_shixun_map[k]] += v.to_i } course_count_map = get_valid_course_count(shixun_ids, end_time) forked_map = get_valid_course_count(forked_shixun_map.keys, end_time)