fix bug

app/helpers/export_helper.rb

@@ -35,7 +35,7 @@ module ExportHelper
       else
         head_cells_add = []
       end
-      normal_head_b_cells = %w(最终成绩 提交时间 更新时间)
+      normal_head_b_cells = %w(最终成绩 提交时间 更新时间 评语)
       @work_head_cells = (head_cells_format + group_cells + normal_head_cells + head_cells_add + allow_late_cell + normal_head_b_cells).reject(&:blank?)
       works.each_with_index do |w, index|
         w_user = w.user
@@ -85,8 +85,21 @@ module ExportHelper
         w_15 = w.work_score.nil? ? "未评分" : w.work_score.round(1)
         w_16 = w.commit_time ? format_time(w.commit_time) : "--"
         w_17 = w.update_time ? format_time(w.update_time) : "--"
+        teacher_comments = w.student_works_scores
+        if teacher_comments.present?
+          w_18 = ""
+          teacher_comments.each do |t|
+            user_name = t.user.real_name
+            user_time = format_time(t.updated_at)
+            user_score = t.score
+            user_comment = t.comment
+            w_18 = w_18 + (user_name + " " + user_time + " " + user_score + "\n" + user_comment + "\n")
+          end
+        else
+          w_18 = "--"
+        end
 
-        row_cells_column = [w_1,w_2,w_3,w_3_1,w_4,w_5,w_6,w_7,w_8,w_9,w_10,w_11,w_12,w_13,w_14,w_15,w_16,w_17]
+        row_cells_column = [w_1,w_2,w_3,w_3_1,w_4,w_5,w_6,w_7,w_8,w_9,w_10,w_11,w_12,w_13,w_14,w_15,w_16,w_17,w_18]
         row_cells_column = row_cells_column.reject(&:blank?)
         @work_cells_column.push(row_cells_column)
       end
@@ -102,7 +115,7 @@ module ExportHelper
       if allow_late_boolean  #允许迟交
         eff_score_cell.push("迟交扣分")
       end
-      shixun_time_cells = %w(最终成绩 更新时间 提交耗时)
+      shixun_time_cells = %w(最终成绩 更新时间 提交耗时 评语)
       @work_head_cells = (head_cells_format + shixun_head_cells + eff_score_cell + shixun_time_cells).reject(&:blank?)
       works.each_with_index do |w, index|
         myshixun = w.try(:myshixun)
@@ -143,7 +156,20 @@ module ExportHelper
         w_15 = w.work_score.nil? ? "--" : w.work_score.round(1)
         w_16 = w.update_time ? format_time(w.update_time) : "--"  "更新时间"
         w_17 = w.cost_time
-        row_cells_column = [w_1,w_2,w_3,w_3_1,w_4,w_5,w_6,w_7,w_8,w_9,w_10,w_11,w_12,w_13,w_14,w_15,w_16,w_17]
+        teacher_comments = w.student_works_scores
+        if teacher_comments.present?
+          w_18 = ""
+          teacher_comments.each do |t|
+            user_name = t.user.real_name
+            user_time = format_time(t.updated_at)
+            user_score = t.score
+            user_comment = t.comment
+            w_18 = w_18 + (user_name + " " + user_time + " " + user_score + "\n" + user_comment + "\n")
+          end
+        else
+          w_18 = "--"
+        end
+        row_cells_column = [w_1,w_2,w_3,w_3_1,w_4,w_5,w_6,w_7,w_8,w_9,w_10,w_11,w_12,w_13,w_14,w_15,w_16,w_17,w_18]
         row_cells_column = row_cells_column.reject(&:blank?)
         @work_cells_column.push(row_cells_column)
       end