Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/games_controller.rb

@@ -344,17 +344,7 @@ class GamesController < ApplicationController
       @game.update_attribute(:test_sets_view, true)
       # 扣分记录
       Grade.create(:user_id => current_user.id, :container_id => @game.id, :score => -@minus_grade, :container_type => "testSet")
-      max_query_index = game.query_index.to_i
-      # 区分评测过未评测过，未评测过按需求取数据
-      if max_query_index > 0
-        qurey_test_sets = TestSet.find_by_sql("SELECT o.code, o.actual_output, o.out_put, o.result, o.compile_success, o.test_set_position, o.query_index,t.is_public,t.input, t.output, g.id as game_id, c.id as challenge_id FROM outputs o,games g ,challenges c,test_sets t where
-                                  g.id=#{game.id} and o.query_index=#{max_query_index} and g.id = o.game_id and c.id= g.challenge_id and t.challenge_id = c.id and t.position =o.test_set_position order by o.query_index
-                                ")
-      else
-        qurey_test_sets = TestSet.find_by_sql("SELECT t.is_public,t.input, t.output,t.position FROM games g ,challenges c,test_sets t where
-                                  g.id=#{game.id} and c.id= g.challenge_id and t.challenge_id = c.id
-                                ")
-      end
+      max_query_index = @game.query_index.to_i
       testset_detail max_query_index, challenge
     else
       tip_exception(-1, "本操作需要扣除#{ @minus_grade }金币，您的金币不够了")