From a588202c5d48dd8fb75aa2aefac713b4f5f8c2b9 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 25 Jun 2019 15:35:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AF=84=E6=B5=8B=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/game.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/game.rb b/app/models/game.rb index c08884afb..ba6664d5c 100644 --- a/app/models/game.rb +++ b/app/models/game.rb @@ -115,9 +115,9 @@ class Game < ApplicationRecord end # 评测次数 - def evaluate_count - self.outputs.pluck(:query_index).first - end + #def evaluate_count + # self.outputs.pluck(:query_index).first + #end # 用户关卡得分 def get_user_final_score From 1e8550a825a7f416161c390e3080407194224722 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 25 Jun 2019 15:41:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=89=93=E5=8D=B0=E8=AF=84=E6=B5=8B?= =?UTF-8?q?=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_works_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb index f4a072a4b..e2d26e89f 100644 --- a/app/controllers/student_works_controller.rb +++ b/app/controllers/student_works_controller.rb @@ -432,6 +432,7 @@ class StudentWorksController < ApplicationController @games = @work.myshixun.games.includes(:challenge, :game_codes, :outputs) if @work.myshixun # 用户最大评测次数 + logger.info("-----------#{@games.map(&:evaluate_count)}") @user_evaluate_count = @games.sum(:evaluate_count) if @games # 图形效率图的数据 @echart_data = student_efficiency(@homework, @work) From d656a879b31b06e6ab65ea5c7d1a70f50dce1643 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 25 Jun 2019 15:43:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=89=93=E5=8D=B0sql?= 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, 2 insertions(+) diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb index e2d26e89f..7d22f4b71 100644 --- a/app/controllers/student_works_controller.rb +++ b/app/controllers/student_works_controller.rb @@ -433,6 +433,8 @@ class StudentWorksController < ApplicationController # 用户最大评测次数 logger.info("-----------#{@games.map(&:evaluate_count)}") + logger.info("-------sum_evaluate_count----#{@games.sum(:evaluate_count)}") + logger.info("-----------#{@games.sum(:evaluate_count).to_sql}") @user_evaluate_count = @games.sum(:evaluate_count) if @games # 图形效率图的数据 @echart_data = student_efficiency(@homework, @work) From e2dce33955956ff4d081717e11f04cc1279fb7dd Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 25 Jun 2019 15:45:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= 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 7d22f4b71..0002a49ea 100644 --- a/app/controllers/student_works_controller.rb +++ b/app/controllers/student_works_controller.rb @@ -434,7 +434,7 @@ class StudentWorksController < ApplicationController # 用户最大评测次数 logger.info("-----------#{@games.map(&:evaluate_count)}") logger.info("-------sum_evaluate_count----#{@games.sum(:evaluate_count)}") - logger.info("-----------#{@games.sum(:evaluate_count).to_sql}") + logger.info("-------sum_evaluate_count----#{@games.sum("games.evaluate_count")}") @user_evaluate_count = @games.sum(:evaluate_count) if @games # 图形效率图的数据 @echart_data = student_efficiency(@homework, @work) From 40979e7b2cbe6c391c0e33c5c3495b7d194918cf Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 25 Jun 2019 15:52:48 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E8=AF=84=E6=B5=8B=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_works_controller.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb index 0002a49ea..7e23443d2 100644 --- a/app/controllers/student_works_controller.rb +++ b/app/controllers/student_works_controller.rb @@ -429,13 +429,17 @@ 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 + # 提示: 这里如果includes outputs表的话: sum(:evaluate_count)会出现错误 + @games = @work.myshixun.games if @work.myshixun # 用户最大评测次数 - logger.info("-----------#{@games.map(&:evaluate_count)}") - logger.info("-------sum_evaluate_count----#{@games.sum(:evaluate_count)}") - logger.info("-------sum_evaluate_count----#{@games.sum("games.evaluate_count")}") - @user_evaluate_count = @games.sum(:evaluate_count) if @games + if @games + @user_evaluate_count = @games.sum(:evaluate_count) + @games = @games.includes(:challenge, :game_codes, :outputs) + else + @user_evaluate_count = 0 + end + # 图形效率图的数据 @echart_data = student_efficiency(@homework, @work) end