From 2a02a749ebc71aa0d2e9ba60f48d1a4979a6f57d Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 17 Jul 2019 09:09:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=AB=9E=E8=B5=9B=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA=E8=80=85=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 25 ++++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 0fa05a84..b4de6576 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -4437,23 +4437,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(:phone) - sheet1[count_row,6] = member_user.try(:mail) - sheet1[count_row,7] = member_user.try(:student_id) - sheet1[count_row,8] = member_user.try(:authentication_status) - sheet1[count_row,9] = member_user.try(:professional_status) - sheet1[count_row,10] = member_user.try(:school_name) - sheet1[count_row,11] = member_user.user_extensions.school.try(:province) - sheet1[count_row,12] = format_time member.created_at - sheet1[count_row,13] = 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