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

app/assets/javascripts/admins/user_schools_statistics/index.js

@@ -63,12 +63,18 @@ $(document).on('turbolinks:load', function() {
 
     // 导出
     $('.export-action').on('click', function(){
-      var form = $(".user-schools-statistic-list-form .search-form")
+      var form = $(".user-schools-statistic-list-form")
       var exportLink = $(this);
       var date = form.find("select[name='date']").val();
       var schoolId = form.find('input[name="school_id"]').val();
+      var province = form.find('input[name="province"]').val();
+      console.log(province)
+      if(province == "" || province == null){
+          alert("只能按省份导出");
+          return;
+      }
 
-      var url = exportLink.data("url").split('?')[0] + "?date=" + date + "&school_id=" + schoolId;
+      var url = exportLink.data("url").split('?')[0] + "?date=" + date + "&school_id=" + schoolId + "&province=" + province;
       window.open(url);
     });
   }

app/controllers/admins/user_schools_statistics_controller.rb

@@ -1,7 +1,7 @@
 class Admins::UserSchoolsStatisticsController < Admins::BaseController
 
   def export
-    params[:per_page] = 50
+    params[:per_page] = 500
     _count, @schools = Admins::UserSchoolsStatisticQuery.call(params)
 
     filename = ['用户运营统计', Time.zone.now.strftime('%Y%m%d%H%M%S')].join('-') << '.xlsx'

app/queries/admins/user_schools_statistic_query.rb

@@ -80,7 +80,6 @@ class Admins::UserSchoolsStatisticQuery < ApplicationQuery
           user_active_count: user_e_map.fetch(school.id, 0)
       }
     end
-
     schools
   end
 

lib/tasks/sync_evaluate.rake

@@ -5,7 +5,7 @@ namespace :sync_evaluate do
     School.find_each do |school|
       puts school.id
       evaluate_count = Game.find_by_sql("select sum(g.evaluate_count) as e_count from games g, user_extensions ue where
-                        g.user_id = ue.user_id and ue.school_id = #{school}.id").firt.try(:e_count)
+                        g.user_id = ue.user_id and ue.school_id = '#{school.id}'").first.try(:e_count)
 
       report =  SchoolReport.find_or_initialize_by(school_id: school.id)
       report.school_name = school.name

public/assets/admin-45860ea5af0c722bca516f40741934c0a72cb033fc04286faf35940a8728808a.js

@@ -140329,12 +140329,18 @@ $(document).on('turbolinks:load', function() {
 
     // 导出
     $('.export-action').on('click', function(){
-      var form = $(".user-schools-statistic-list-form .search-form")
+      var form = $(".user-schools-statistic-list-form")
       var exportLink = $(this);
       var date = form.find("select[name='date']").val();
       var schoolId = form.find('input[name="school_id"]').val();
+      var province = form.find('input[name="province"]').val();
+      console.log(province)
+      if(province == "" || province == null){
+          alert("只能按省份导出");
+          return;
+      }
 
-      var url = exportLink.data("url").split('?')[0] + "?date=" + date + "&school_id=" + schoolId;
+      var url = exportLink.data("url").split('?')[0] + "?date=" + date + "&school_id=" + schoolId + "&province=" + province;
       window.open(url);
     });
   }