dev_aliyun
cxt 5 years ago
parent 00c614cd46
commit a1c1d52b47

@ -2941,7 +2941,7 @@ end
else else
for row in 2 .. rows for row in 2 .. rows
student_id = worksheet.cell(row, 1) student_id = worksheet.cell(row, 1)
student_id = student_id.is_a?(Float) ? student_id.to_i : student_id student_id = student_id.is_a?(Float) ? student_id.to_s.strip.to_i : student_id.to_s.strip
member_role = worksheet.cell(row, 4).to_i member_role = worksheet.cell(row, 4).to_i
course_id = worksheet.cell(row, 3) course_id = worksheet.cell(row, 3)
group_name = worksheet.cell(row, 5) group_name = worksheet.cell(row, 5)
@ -3027,15 +3027,15 @@ end
user.admin = false user.admin = false
user.activate user.activate
user.login = prefix + list[0].to_s.strip user.login = prefix + list[0].to_s.strip
user.lastname = list[1] user.lastname = list[1].to_s.strip
user.nickname = list[1] user.nickname = list[1].to_s.strip
user.professional_certification = 1 user.professional_certification = 1
user.certification = 1 user.certification = 1
user.grade = 0 user.grade = 0
user.password = "12345678" user.password = "12345678"
user.phone = list[5] user.phone = list[5].blank? ? nil : list[5]
if user.save if user.save
ue = UserExtensions.new(:user_id => user.id, :gender => 0, :school_id => school_id, :location => school.province, :location_city => school.city, :identity => list[3], :student_id => list[0], :department_id => department.try(:id)) ue = UserExtensions.new(:user_id => user.id, :gender => 0, :school_id => school_id, :location => school.province, :location_city => school.city, :identity => list[3].to_i, :student_id => list[0].to_s.strip, :department_id => department.try(:id))
if list[3] && list[3].to_i == 0 if list[3] && list[3].to_i == 0
ue.technical_title = ["教授", "副教授", "讲师", "助教"].include?(list[4]) ? list[4] : "讲师" ue.technical_title = ["教授", "副教授", "讲师", "助教"].include?(list[4]) ? list[4] : "讲师"
elsif list[3] && list[3].to_i == 2 elsif list[3] && list[3].to_i == 2

Loading…
Cancel
Save