forked from Trustie/forgeplus
更改:导入模板用户标识新增*
This commit is contained in:
parent
f087ce24ed
commit
b3e5af3f2b
|
|
@ -163,7 +163,7 @@ class CompetitionInfosController < ApplicationController
|
||||||
member_array << member
|
member_array << member
|
||||||
end
|
end
|
||||||
send_data["members"] = member_array
|
send_data["members"] = member_array
|
||||||
login_index = column_names.index("用户标识")
|
login_index = column_names.index("用户标识*")
|
||||||
user = User.find_by(login:row[login_index]) || User.find_by(phone: send_data['phone'])
|
user = User.find_by(login:row[login_index]) || User.find_by(phone: send_data['phone'])
|
||||||
if user.present?
|
if user.present?
|
||||||
begin
|
begin
|
||||||
|
|
@ -191,7 +191,7 @@ class CompetitionInfosController < ApplicationController
|
||||||
format.xlsx {
|
format.xlsx {
|
||||||
set_export_cookies
|
set_export_cookies
|
||||||
enroll_fields = @competition_info.enroll_fields.except("ID")
|
enroll_fields = @competition_info.enroll_fields.except("ID")
|
||||||
@table_columns = ["用户标识"] | enroll_fields.keys
|
@table_columns = ["用户标识*"] | enroll_fields.keys
|
||||||
if EduSetting.get("is_local") == "true"
|
if EduSetting.get("is_local") == "true"
|
||||||
@table_columns = @table_columns + ["成员姓名", "成员单位", "成员手机号"]
|
@table_columns = @table_columns + ["成员姓名", "成员单位", "成员手机号"]
|
||||||
else
|
else
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue