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

app/controllers/managements_controller.rb

@@ -4446,21 +4446,24 @@ end
       end
     end
     if competition.max_num > 1
-      sheet1.row(0).concat(["序号", "战队ID", "战队名称","指导老师", "队员姓名", "学号", "实名认证", "职业认证", "学校名称", "地区", "报名时间", "排名"])
+      sheet1.row(0).concat(["序号", "战队ID", "战队名称", "战队创建者", "指导老师", "队员姓名", "手机号", "邮箱", "学号", "实名认证", "职业认证", "学校名称", "地区", "报名时间", "排名"])
       members.each_with_index do |member, index|
         member_user = member.user
         sheet1[count_row,0] = index + 1
         sheet1[count_row,1] = member.competition_team.try(:id)
         sheet1[count_row,2] = member.competition_team.try(:name)
-        sheet1[count_row,3] = member.competition_team.teacher.try(:show_real_name)
-        sheet1[count_row,4] = member_user.try(:show_real_name)
-        sheet1[count_row,5] = member_user.try(:student_id)
-        sheet1[count_row,6] = member_user.try(:authentication_status)
-        sheet1[count_row,7] = member_user.try(:professional_status)
-        sheet1[count_row,8] = member_user.try(:school_name)
-        sheet1[count_row,9] = member_user.user_extensions.school.try(:province)
-        sheet1[count_row,10] = format_time member.created_at
-        sheet1[count_row,11] = records.present? ? (records.map(&:id).index(member.competition_team_id).to_i + 1) : "--"
+        sheet1[count_row,3] = member.competition_team.user.try(:show_real_name)
+        sheet1[count_row,4] = member.competition_team.teacher.try(:show_real_name)
+        sheet1[count_row,5] = member_user.try(:show_real_name)
+        sheet1[count_row,6] = member_user.try(:phone)
+        sheet1[count_row,7] = member_user.try(:mail)
+        sheet1[count_row,8] = member_user.try(:student_id)
+        sheet1[count_row,9] = member_user.try(:authentication_status)
+        sheet1[count_row,10] = member_user.try(:professional_status)
+        sheet1[count_row,11] = member_user.try(:school_name)
+        sheet1[count_row,12] = member_user.user_extensions.school.try(:province)
+        sheet1[count_row,13] = format_time member.created_at
+        sheet1[count_row,14] = records.present? ? (records.map(&:id).index(member.competition_team_id).to_i + 1) : "--"
         count_row += 1
       end
     else