Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/admins/shixun_settings_controller.rb

@@ -68,12 +68,13 @@ class Admins::ShixunSettingsController < Admins::BaseController
     shixuns.includes(:challenges, :user, :myshixuns, :mirror_repositories).find_each do |shixun|
       sheet1[count_row, 0] = shixun.identifier
       sheet1[count_row, 1] = shixun.name
-      sheet1[count_row, 2] = shixun.mirror_repositories.map{|mr| mr.main_type == 1}.first&.type_name
+      sheet1[count_row, 2] = shixun.mirror_repositories.select{|mr| mr.main_type == "1"}.first&.type_name
+
       sheet1[count_row, 3] = shixun.fork_identifier
-      sheet1[count_row, 4] = shixun.challenges.map{|c| c.st == 0}.size
-      sheet1[count_row, 5] = shixun.challenges.map{|c| c.st == 1}.size
+      sheet1[count_row, 4] = shixun.challenges.select{|c| c.st == 0}.size
+      sheet1[count_row, 5] = shixun.challenges.select{|c| c.st == 1}.size
       sheet1[count_row, 6] = shixun.myshixuns_count
-      sheet1[count_row, 7] = shixun.myshixuns.map{|m| m.status == 1}.size
+      sheet1[count_row, 7] = shixun.myshixuns.select{|m| m.status == 1}.size
       sheet1[count_row, 8] = shixun.shixun_status
       sheet1[count_row, 9] = shixun.user.show_real_name
       sheet1[count_row, 10] = shixun.user.school_name