From f8ff72ce8b44ec93723bbd8386e3ab9fb7eb8165 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 9 Mar 2020 17:38:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BC=98=E5=8C=96=E6=96=B0?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/challenges_controller.rb | 6 +++---
 app/views/challenges/index.json.jbuilder | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb
index 4a95e8ab6..164162fd6 100644
--- a/app/controllers/challenges_controller.rb
+++ b/app/controllers/challenges_controller.rb
@@ -157,9 +157,9 @@ class ChallengesController < ApplicationController
     uid_logger("identifier: #{params}")
     base_columns = "challenges.id, challenges.subject, challenges.st, challenges.score, challenges.position,
                     challenges.shixun_id, games.identifier, games.status"
-    # 方便列表获取通关数
-    @pass_games_map = @shixun.challenges.joins(:games).where(games: {status:2}).group(:challenge_id).reorder(nil).count
-    @play_games_map = @shixun.challenges.joins(:games).where(games: {status:[0,1]}).group(:challenge_id).reorder(nil).count
+    # 方便列表获取通关数和游玩数
+    #@pass_games_map = @shixun.challenges.joins(:games).where(games: {status:2}).group(:challenge_id).reorder(nil).count
+    #@play_games_map = @shixun.challenges.joins(:games).where(games: {status:[0,1]}).group(:challenge_id).reorder(nil).count
     @challenges = @shixun.challenges.joins(:games).where(games: {user_id: current_user.id}).select(base_columns)
     @editable = @shixun.status == 0 # before_action：有判断权限，如果没发布，则肯定是管理人员
     @user = current_user
diff --git a/app/views/challenges/index.json.jbuilder b/app/views/challenges/index.json.jbuilder
index ddf75c833..87c6491bb 100644
--- a/app/views/challenges/index.json.jbuilder
+++ b/app/views/challenges/index.json.jbuilder
@@ -16,8 +16,10 @@ if @challenges.present?
     json.st challenge.st
     json.name challenge.subject
     json.score challenge.score
-    json.passed_count @pass_games_map.fetch(challenge.id, 0)
-    json.playing_count @play_games_map.fetch(challenge.id, 0)
+    #json.passed_count @pass_games_map.fetch(challenge.id, 0)
+    json.passed_count challenge.user_passed_count
+    #json.playing_count @play_games_map.fetch(challenge.id, 0)
+    json.playing_count challenge.playing_count
     json.name_url shixun_challenge_path(challenge, shixun_identifier: @shixun.identifier)
     json.open_game challenge.open_game
     if @editable