Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

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)
@@ -56,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]] += v }
+      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)