From 85f50da302820983909a4b85a84b548aa35ae904 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 15 Jan 2020 14:16:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E4=B9=89=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/subjects/user_used_info_service.rb | 2 +- lib/tasks/statistic_subject_info.rake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/subjects/user_used_info_service.rb b/app/services/subjects/user_used_info_service.rb index 52d6be005..e4442a2f4 100644 --- a/app/services/subjects/user_used_info_service.rb +++ b/app/services/subjects/user_used_info_service.rb @@ -9,7 +9,7 @@ class Subjects::UserUsedInfoService < ApplicationService def call users_info = [] - users = User.includes(myshixuns: :games).where(myshixuns: {shixun_id: shixun_ids}, games: {status: 2}) + users = User.includes(myshixuns: :games).where(myshixuns: {shixun_id: shixun_ids}, games: {status: 2}, users: {is_test: false}) users.find_each do |user| myshixuns = user.myshixuns.select{|m| shixun_ids.include?(m.shixun_id)} name = "#{user.lastname}#{user.firstname}" diff --git a/lib/tasks/statistic_subject_info.rake b/lib/tasks/statistic_subject_info.rake index 4c1ca58a0..475cb0e8c 100644 --- a/lib/tasks/statistic_subject_info.rake +++ b/lib/tasks/statistic_subject_info.rake @@ -128,7 +128,7 @@ namespace :subjects do data.each do |key| next if key[:user_id].nil? str += ", " unless str.empty? - str += ("(#{key[:user_id]}, #{subject.id}, '#{key[:name]}', '#{key[:passed_myshixun_count]}', " + + str += ("(#{key[:user_id]}, #{subject.id}, ''#{key[:name].gsub(/'/, '"')}', #{key[:passed_myshixun_count]}, " + "#{key[:passed_games_count]}, #{key[:code_line_count]}, #{key[:evaluate_count]}, #{key[:cost_time]}, " + "'#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')") buffer_size += 1