From 5b629fb285c08be6d9e9f3251989e1c2419a3d19 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 26 Jul 2019 23:55:33 +0800
Subject: [PATCH] =?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/courses_controller.rb         | 19 ++++++++++---------
 .../export_member_scores_excel.xlsx.axlsx     |  1 +
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 897fb34b9..bdb367111 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1255,15 +1255,16 @@ class CoursesController < ApplicationController
           u_2: user_login,
           u_2_1: user_mail,
           u_3: user_stu_id,
-          u_4: user_course_group,
-          u_5: c_works_num,
-          u_6: c_exercise_num,
-          u_7: c_poll_num,
-          u_8: c_file_num,
-          u_9: c_message_num,
-          u_10: c_reply_num,
-          u_11: user_work_reply_num,
-          u_12: user_activity_levels
+          u_4: user_school,
+          u_5: user_course_group,
+          u_6: c_works_num,
+          u_7: c_exercise_num,
+          u_8: c_poll_num,
+          u_9: c_file_num,
+          u_10: c_message_num,
+          u_11: c_reply_num,
+          u_12: user_work_reply_num,
+          u_13: user_activity_levels
       }
       course_user_level.push(user_ac_level)
 
diff --git a/app/views/courses/export_member_scores_excel.xlsx.axlsx b/app/views/courses/export_member_scores_excel.xlsx.axlsx
index 5b226a09c..4750304e4 100644
--- a/app/views/courses/export_member_scores_excel.xlsx.axlsx
+++ b/app/views/courses/export_member_scores_excel.xlsx.axlsx
@@ -59,6 +59,7 @@ wb.styles do |s|
     sheet.merge_cells("D1:D2")
     sheet.merge_cells("E1:E2")
     sheet.merge_cells("F1:F2")
+    sheet.merge_cells("G1:G2")
     sheet.merge_cells (Axlsx::cell_r(sheet_length-1,0) + ':' + Axlsx::cell_r(sheet_length-1,1))   #最后一行的合并
     sheet_first = sheet.rows.first  #第一行
     sheet_second = sheet.rows.second  #第二行