From 899c7fb673408e839febe7b9720af7bee9c2a8d9 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 22 Jun 2019 14:08:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20190622060005_remove_shixun_long_text_for_shixuns.rb       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20190622060005_remove_shixun_long_text_for_shixuns.rb b/db/migrate/20190622060005_remove_shixun_long_text_for_shixuns.rb
index bcc8a2bce..4557c610f 100644
--- a/db/migrate/20190622060005_remove_shixun_long_text_for_shixuns.rb
+++ b/db/migrate/20190622060005_remove_shixun_long_text_for_shixuns.rb
@@ -1,6 +1,6 @@
 class RemoveShixunLongTextForShixuns < ActiveRecord::Migration[5.2]
   def change
-    if Shixun.first.description.present?
+    if Shixun.first.has_attribute?(:description)
       remove_columns :shixuns, :description, :propaedeutics, :evaluate_script
     end
   end

From 9642805db14358b21777ead1bf681fd0e84c9565 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 22 Jun 2019 14:45:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_works_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb
index aa0a0f171..9c71b82e2 100644
--- a/app/controllers/student_works_controller.rb
+++ b/app/controllers/student_works_controller.rb
@@ -429,7 +429,7 @@ class StudentWorksController < ApplicationController
   def shixun_work_report
     @user = @work.user
     @shixun = @homework.shixuns.take
-    @games = @work.myshixun.games.includes(:challenge, :game_codes,:outputs) if @work.myshixun
+    @games = @work.myshixun.games.includes(:challenge) if @work.myshixun
 
     # 用户最大评测次数
     @user_evaluate_count = @games.inject(0){|sum, g| sum + g.outputs.pluck(:query_index).first.to_i } if @games

From f630266141e4d7e51b6ba93e400fadd8518257d9 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sat, 22 Jun 2019 14:48:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_works_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb
index 9c71b82e2..213ea40c0 100644
--- a/app/controllers/student_works_controller.rb
+++ b/app/controllers/student_works_controller.rb
@@ -432,7 +432,7 @@ class StudentWorksController < ApplicationController
     @games = @work.myshixun.games.includes(:challenge) if @work.myshixun
 
     # 用户最大评测次数
-    @user_evaluate_count = @games.inject(0){|sum, g| sum + g.outputs.pluck(:query_index).first.to_i } if @games
+    @user_evaluate_count = @games.sum(:evaluate_count) if @games
     # 图形效率图的数据
     @echart_data = student_efficiency(@homework, @work)
   end
@@ -440,10 +440,10 @@ class StudentWorksController < ApplicationController
   def export_shixun_work_report
     @user = @work.user
     @shixun = @homework.shixuns.take
-    @games = @work.myshixun.games.includes(:challenge, :game_codes,:outputs) if @work.myshixun
+    @games = @work.myshixun.games.includes(:challenge, :game_codes) if @work.myshixun
 
     # 用户最大评测次数
-    @user_evaluate_count = @games.inject(0){|sum, g| sum + g.outputs.pluck(:query_index).first.to_i } if @games
+    @user_evaluate_count = @games.sum(:evaluate_count) if @games
     # 图形效率图的数据
     @echart_data = student_efficiency(@homework, @work)
     @myself_eff = @echart_data[:efficiency_list].find { |item| item.last == @user.id }