+
From f21da8bf87e9eeeb69a49184412e842d90f414ad Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 11 Nov 2019 15:42:59 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/admins/enroll_lists/export.xlsx.axlsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/admins/enroll_lists/export.xlsx.axlsx b/app/views/admins/enroll_lists/export.xlsx.axlsx
index b6f403ab8..a075524ed 100644
--- a/app/views/admins/enroll_lists/export.xlsx.axlsx
+++ b/app/views/admins/enroll_lists/export.xlsx.axlsx
@@ -21,7 +21,7 @@ wb.add_worksheet(name: '报名列表') do |sheet|
member_user.professional_certification ? "√" : "",
member_user.school_name,
member_user.school_province,
- member.created_at.strftime('%Y-%m-%d %H:%M'),
+ team.created_at&.strftime('%Y-%m-%d %H:%M'),
rank
]
sheet.add_row(data)
From 621b93ecb6fde7f9281ec032c04685989b6d0f04 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 11 Nov 2019 15:47:46 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=88=90=E7=BB=A9?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/competitions/competitions_controller.rb | 6 +++---
app/views/admins/enroll_lists/export.xlsx.axlsx | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/controllers/competitions/competitions_controller.rb b/app/controllers/competitions/competitions_controller.rb
index 6ab7e83a0..d1bff1169 100644
--- a/app/controllers/competitions/competitions_controller.rb
+++ b/app/controllers/competitions/competitions_controller.rb
@@ -123,19 +123,19 @@ class Competitions::CompetitionsController < Competitions::BaseController
@stage = @competition.competition_stages.take
end
- @records = @competition.competition_teams.joins(:competition_scores).where(competition_scores: {competition_stage_id: @stage&.id.to_i})
+ @all_records = @competition.competition_teams.joins(:competition_scores).where(competition_scores: {competition_stage_id: @stage&.id.to_i})
.select("competition_teams.*, score, cost_time").order("score desc, cost_time desc")
current_team_ids = @competition.team_members.where(user_id: current_user.id).pluck(:competition_team_id).uniq
@user_ranks = @records.select{|com_team| current_team_ids.include?(com_team.id)}
- @records = @records.where("score > 0")
+ @records = @all_records.where("score > 0")
@record_ids = @records.pluck(:id)
if params[:format] == "xlsx"
@records = @records.includes(user: [user_extension: :school], team_members: :user)
respond_to do |format|
format.xlsx{
set_export_cookies
- chart_to_xlsx(@records, @competition)
+ chart_to_xlsx(@all_records, @competition)
exercise_export_name = "#{@competition.name}比赛成绩"
render xlsx: "#{exercise_export_name.strip}",template: "competitions/competitions/chart_list.xlsx.axlsx",locals:
{table_columns: @competition_head_cells, chart_lists: @competition_cells_column}
diff --git a/app/views/admins/enroll_lists/export.xlsx.axlsx b/app/views/admins/enroll_lists/export.xlsx.axlsx
index a075524ed..303b48a07 100644
--- a/app/views/admins/enroll_lists/export.xlsx.axlsx
+++ b/app/views/admins/enroll_lists/export.xlsx.axlsx
@@ -14,9 +14,9 @@ wb.add_worksheet(name: '报名列表') do |sheet|
@personal ? "--" : team.teachers_info,
member_user.real_name,
member_user.identity,
- member_user.phone,
+ member_user.phone.present? ? (member_user.phone.to_s + "\t") : "--",
member_user.mail,
- member_user.student_id,
+ member_user.student_id.present? ? (member_user.student_id.to_s + "\t") : "--",
member_user.authentication ? "√" : "",
member_user.professional_certification ? "√" : "",
member_user.school_name,
From bfd60ba97120d5562687b32f7cb19374129da30a Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 11 Nov 2019 15:52:08 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=88=90=E7=BB=A9?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/competitions/competitions_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/competitions/competitions_controller.rb b/app/controllers/competitions/competitions_controller.rb
index d1bff1169..a92170668 100644
--- a/app/controllers/competitions/competitions_controller.rb
+++ b/app/controllers/competitions/competitions_controller.rb
@@ -127,7 +127,7 @@ class Competitions::CompetitionsController < Competitions::BaseController
.select("competition_teams.*, score, cost_time").order("score desc, cost_time desc")
current_team_ids = @competition.team_members.where(user_id: current_user.id).pluck(:competition_team_id).uniq
- @user_ranks = @records.select{|com_team| current_team_ids.include?(com_team.id)}
+ @user_ranks = @all_records.select{|com_team| current_team_ids.include?(com_team.id)}
@records = @all_records.where("score > 0")
@record_ids = @records.pluck(:id)
if params[:format] == "xlsx"