From c32cdbb1eb2516995b88b48d5e49cff3a094ea98 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 25 Oct 2019 15:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=97=AE=E5=8D=B7=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E5=88=86=E7=8F=AD=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/polls_controller.rb | 5 +++--
 app/helpers/export_helper.rb        | 3 +--
 app/models/course.rb                | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
index bbd2a06fa..039d5e5c8 100644
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@@ -1363,7 +1363,7 @@ class PollsController < ApplicationController
     poll_ques_titles = poll_questions.pluck(:question_title).map {|k| ActionController::Base.helpers.strip_tags(k) if k.present?}
     poll_un_anony = poll.un_anonymous
     if poll_un_anony   #是否匿名，默认为false
-      user_info = %w(登陆名 真实姓名 邮箱 学号 学员单位)
+      user_info = %w(登陆名 真实姓名 分班 邮箱 学号 学员单位)
     else
       user_info = []
     end
@@ -1436,9 +1436,10 @@ class PollsController < ApplicationController
       if poll_un_anony
         user_login = u_user.login
         user_name = u_user.real_name.present? ? u_user.real_name : "--"
+        user_class = poll.course.user_group_name
         user_student_id = u_user.student_id.present? ? u_user.student_id : "--"
         user_school_name = u_user.school_name.present? ? u_user.school_name : "--"
-        user_cell += [user_login,user_name, u_user.mail, user_student_id, user_school_name]
+        user_cell += [user_login,user_name, user_class, u_user.mail, user_student_id, user_school_name]
       end
       all_user_cell = user_cell + user_answer_array
       user_commit.push(all_user_cell)
diff --git a/app/helpers/export_helper.rb b/app/helpers/export_helper.rb
index 534a78dc1..1274e07c7 100644
--- a/app/helpers/export_helper.rb
+++ b/app/helpers/export_helper.rb
@@ -300,8 +300,7 @@ module ExportHelper
 
     export_ex_users.includes(user: :user_extension).each_with_index do |e_user,index|
       user_info = e_user.user
-      member = course.students.find_by_user_id(e_user.user_id)
-      user_course = member.try(:course_group_name)
+      user_course = course.user_group_name(e_user.user_id)
       user_obj_score = e_user.objective_score < 0.0 ? 0.0 : e_user.objective_score.round(1).to_s
       user_suj_score = e_user.subjective_score < 0.0 ? 0.0 : e_user.subjective_score.round(1).to_s
       user_score = e_user.score.present? ? e_user.score.round(1).to_s : 0.0
diff --git a/app/models/course.rb b/app/models/course.rb
index 6dd361733..01eed30db 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -130,6 +130,10 @@ class Course < ApplicationRecord
     course_members.find_by(user_id: user_id, role: %i(STUDENT))
   end
 
+  def user_group_name(user_id)
+    students.find_by(user_id: user_id)&.course_group_name
+  end
+
 
   def teacher_group(user_id)
     data =