diff --git a/Gemfile b/Gemfile index b9e1b4e2..9ff7d11f 100644 --- a/Gemfile +++ b/Gemfile @@ -62,6 +62,9 @@ gem 'elasticsearch-rails' gem 'oauth2' +# cronjob +gem 'whenever', require: false + #Ruby 2.2+ has removed test/unit from the core library. if RUBY_VERSION>='2.2' gem 'test-unit', '~> 3.0' diff --git a/app/controllers/managements/schools_controller.rb b/app/controllers/managements/schools_controller.rb index 6684db66..6dfe84fb 100644 --- a/app/controllers/managements/schools_controller.rb +++ b/app/controllers/managements/schools_controller.rb @@ -1,20 +1,44 @@ class Managements::SchoolsController < Managements::BaseController before_filter :set_navigation_bar - before_filter :set_default_sort_params, only: :statistics + before_filter :contrast_column_select_options, only: [:data_contrast] def statistics @sub_type = 1 + params[:sort_by] ||= :teacher_count + params[:sort_direction] ||= :desc + schools = Management::SchoolReportService.new(params).call @schools = paginateHelper schools end + def yesterday_data + @sub_type = 2 + params[:sort_by] ||= :teacher_increase_count + params[:sort_direction] ||= :desc + + reports = Management::SchoolYesterdayDataService.new(params).call + @reports = paginateHelper reports + end + + def data_contrast + params[:contrast_column] = :teacher_increase_count if params[:contrast_column].blank? + params[:sort_direction] ||= :desc + params[:sort_by] ||= :percentage + + @obj_count, @reports = Management::SchoolDataContrastService.new(params).call + @obj_pages = Paginator.new(@obj_count, Management::SchoolDataContrastService::PAGE_SIZE, params[:page]) + rescue Management::SchoolDataContrastService::ParameterError + raise '参数错误' + end + private def set_navigation_bar @menu_type = 1 end - def set_default_sort_params - params[:sort_by] ||= :teacher_count - params[:sort_direction] ||= :desc + def contrast_column_select_options + @select_options = Management::SchoolDataContrastService::CONTRAST_COLUMN_LIST.map do |column| + [I18n.t("school_daily_report.#{column}"), column] + end end -end \ No newline at end of file +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b08cda24..a2e5948a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -671,7 +671,7 @@ module ApplicationHelper when 1 case sub_type when 1 then "统计总表" - when 2 then "变化报表" + when 2 then "数据变化报表" end when 2 sub_type == 1 ? "课程列表" : (sub_type == 2? "课堂列表" : (sub_type == 3? "实训作业" : "项目列表")) diff --git a/app/libs/custom_sortable.rb b/app/libs/custom_sortable.rb index 721cbd1e..a8549452 100644 --- a/app/libs/custom_sortable.rb +++ b/app/libs/custom_sortable.rb @@ -11,7 +11,7 @@ module CustomSortable sort_by ||= self.class.sort_options[:default_by] sort_direction ||= self.class.sort_options[:default_direction] - return relations unless self.class.check_sort_parameter_validate(sort_by, sort_direction) + return relations unless self.class.check_sort_parameter_validate(sort_by.to_s, sort_direction.to_s) order_method = self.class.sort_options[:reorder] ? :reorder : :order relations.send(order_method, "#{sort_by} #{sort_direction}") diff --git a/app/models/school_daily_report.rb b/app/models/school_daily_report.rb new file mode 100644 index 00000000..494eacfd --- /dev/null +++ b/app/models/school_daily_report.rb @@ -0,0 +1,3 @@ +class SchoolDailyReport < ActiveRecord::Base + belongs_to :school +end \ No newline at end of file diff --git a/app/models/shixun.rb b/app/models/shixun.rb index 6ab98172..54882be1 100644 --- a/app/models/shixun.rb +++ b/app/models/shixun.rb @@ -28,6 +28,7 @@ class Shixun < ActiveRecord::Base :propaedeutics, :trainee, :major_id, :homepage_show, :webssh, :hidden, :fork_from, :can_copy, :modify_time, :reset_time, :git_url, :use_scope, :vnc, :evaluate_script, :image_text, :exec_time, :test_set_permission, :hide_code, :excute_time, :forbid_copy + belongs_to :creator, foreign_key: :user_id, class_name: 'User' has_many :users, :through => :shixun_members has_many :shixun_members, :dependent => :destroy has_one :repository, :dependent => :destroy diff --git a/app/services/management/school_data_contrast_service.rb b/app/services/management/school_data_contrast_service.rb new file mode 100644 index 00000000..a1ad4c24 --- /dev/null +++ b/app/services/management/school_data_contrast_service.rb @@ -0,0 +1,66 @@ +class Management::SchoolDataContrastService + ParameterError = Class.new(StandardError) + + PAGE_SIZE = 20 + CONTRAST_COLUMN_LIST = %w( + teacher_increase_count student_increase_count course_increase_count + shixun_increase_count active_user_count + ).freeze + + attr_reader :params, :sort_direction, :contrast_column + + def initialize(params) + @params = params + @sort_direction = params[:sort_direction].to_s + @contrast_column = params[:contrast_column].to_s + end + + def call + validate_parameter! + reports = SchoolDailyReport.select(select_columns) + + keyword = params[:keyword].try(:to_s).try(:strip) + if keyword.present? + reports = reports.where("school_name LIKE :keyword OR school_id LIKE :keyword", keyword: "%#{keyword}%") + end + + reports = reports.group(:school_id) + count = reports.count.count + + [count, SchoolDailyReport.find_by_sql(query_report_sql(reports.to_sql))] + end + + private + def validate_parameter! + if %i[begin_date end_date other_begin_date other_end_date].any? { |key| params[key].blank? } + raise ParameterError + end + + unless %w(desc asc).include?(sort_direction) + raise ParameterError + end + + unless CONTRAST_COLUMN_LIST.include?(contrast_column) + raise ParameterError + end + end + + def format_date(date) + Time.zone.parse(date).strftime("%Y-%m-%d") + end + + def offset + (params[:page].to_i.zero? ? 0 : params[:page].to_i - 1) * PAGE_SIZE + end + + def select_columns + "school_id, school_name,"\ + "SUM(IF(date BETWEEN '#{format_date(params[:begin_date])}' AND '#{format_date(params[:end_date])}', #{contrast_column}, 0)) total,"\ + "SUM(IF(date BETWEEN '#{format_date(params[:other_begin_date])}' AND '#{format_date(params[:other_end_date])}', #{contrast_column}, 0)) other_total" + end + + def query_report_sql(from_sql) + "SELECT reports.*, (other_total - total) increase, (IF(other_total - total = 0, 0.0, round((other_total - total) / IF(total = 0, 1, total), 5))) percentage "\ + "FROM (#{from_sql}) reports ORDER BY percentage #{sort_direction} LIMIT #{PAGE_SIZE} OFFSET #{offset}" + end +end diff --git a/app/services/management/school_report_service.rb b/app/services/management/school_report_service.rb index 9b794b7b..5a962bd5 100644 --- a/app/services/management/school_report_service.rb +++ b/app/services/management/school_report_service.rb @@ -29,16 +29,12 @@ class Management::SchoolReportService <<-SQL schools.id, schools.name, ( - SELECT COUNT(*) FROM users u - LEFT JOIN user_extensions ue ON ue.user_id = u.id - LEFT JOIN ec_school_users esu ON esu.user_id = u.id - WHERE esu.school_id = schools.id AND ue.identity = #{User::STUDENT} + SELECT COUNT(*) FROM user_extensions ue + WHERE ue.school_id = schools.id AND ue.identity = #{User::STUDENT} ) student_count, ( - SELECT COUNT(*) FROM users u - LEFT JOIN user_extensions ue ON ue.user_id = u.id - LEFT JOIN ec_school_users esu ON esu.user_id = u.id - WHERE esu.school_id = schools.id AND ue.identity = #{User::TEACHER} + SELECT COUNT(*) FROM user_extensions ue + WHERE ue.school_id = schools.id AND ue.identity = #{User::TEACHER} ) teacher_count, ( SELECT COUNT(*) FROM homework_commons hc diff --git a/app/services/management/school_yesterday_data_service.rb b/app/services/management/school_yesterday_data_service.rb new file mode 100644 index 00000000..238a7297 --- /dev/null +++ b/app/services/management/school_yesterday_data_service.rb @@ -0,0 +1,32 @@ +class Management::SchoolYesterdayDataService + include CustomSortable + + attr_reader :params + + sort_columns :student_increase_count, :teacher_increase_count, + :course_increase_count, :shixun_increase_count, :active_user_count, + default_by: :teacher_increase_count, default_direction: :desc + + def initialize(params) + @params = params + end + + def call + reports = SchoolDailyReport.where(date: yesterday) + + keyword = params[:keyword].try(:to_s).try(:strip) + if keyword.present? + reports = reports.where("school_name LIKE :keyword OR school_id LIKE :keyword", keyword: "%#{keyword}%") + end + + reports = custom_sort(reports, params[:sort_by], params[:sort_direction]) + + reports + end + + private + def yesterday + # 每日凌晨5点为节点, 25日凌晨4点、3点、2点等等，未到更新数据时间点，看到的数据是：23日-24日的统计数据 + (Time.zone.now - 5.hours).beginning_of_day - 1.days + end +end diff --git a/app/tasks/statistic_school_daily_report_task.rb b/app/tasks/statistic_school_daily_report_task.rb new file mode 100644 index 00000000..3569351f --- /dev/null +++ b/app/tasks/statistic_school_daily_report_task.rb @@ -0,0 +1,44 @@ +class StatisticSchoolDailyReportTask + def call + School.find_each do |school| + # 新增教师和学生 + users = User.joins(:user_extensions) + .where(user_extensions: { school_id: school.id }) + + teacher_count = users.where(created_on: yesterday, user_extensions: { identity: User::TEACHER }).count + student_count = users.where(created_on: yesterday, user_extensions: { identity: User::STUDENT }).count + + # 活跃用户 + active_user_count = users.where(last_login_on: yesterday).count + + # 新增课堂 + course_count = school.courses.where(created_at: yesterday).count + + # 新增实训 + shixun_count = Shixun.joins(creator: :user_extensions) + .where('user_extensions.school_id = ?', school.id) + .where(created_at: yesterday).count + + create_params = { + school_id: school.id, school_name: school.name, teacher_increase_count: teacher_count, + student_increase_count: student_count, course_increase_count: course_count, + shixun_increase_count: shixun_count, active_user_count: active_user_count, date: current_date + } + SchoolDailyReport.create!(create_params) + end + end + + private + def current_date + @_current_date ||= Time.zone.now.beginning_of_day - 1.day + end + + def yesterday + @_yesterday ||= begin + # 每日凌晨5点为节点 + end_time = Time.zone.now.beginning_of_day + 5.hour + begin_time = end_time - 1.day + begin_time..end_time + end + end +end diff --git a/app/views/layouts/base_management.html.erb b/app/views/layouts/base_management.html.erb index c38bf3eb..9d1d77c8 100644 --- a/app/views/layouts/base_management.html.erb +++ b/app/views/layouts/base_management.html.erb @@ -35,6 +35,7 @@
  • 学校+
  • 课堂+ diff --git a/app/views/managements/schools/_contrast_search_form.html.erb b/app/views/managements/schools/_contrast_search_form.html.erb new file mode 100644 index 00000000..2140eb97 --- /dev/null +++ b/app/views/managements/schools/_contrast_search_form.html.erb @@ -0,0 +1,223 @@ +
    +
    + <%= hidden_field_tag :contrast_column, params[:contrast_column] %> + <%= hidden_field_tag :begin_date, params[:begin_date] %> + <%= hidden_field_tag :end_date, params[:end_date] %> + <%= hidden_field_tag :other_begin_date, params[:other_begin_date] %> + <%= hidden_field_tag :other_end_date, params[:other_end_date] %> + + <%= text_field_tag :date_input, params[:date_input], + class: 'date-input winput-200-30', placeholder: '请选择时间段一' %> + VS + <%= text_field_tag :other_date_input, params[:other_date_input], + class: 'other-date-input winput-200-30', placeholder: '请选择时间段二' %> +
    + +
    + <%= hidden_field_tag :data_type, params[:data_type] || 'yesterday' %> + <% if params[:data_type] == 'contrast' %> + 时间对比 + 日新增 + <% else %> + 时间对比 + 日新增 + <% end %> +
    + + <%= text_field_tag :keyword, params[:keyword], placeholder: '请输入单位名称或者ID关键字进行搜索', + class: 'fl task-form-30 task-height-30 mt10', style: 'margin: 10px 10px 10px 25px;' %> + <%= link_to '搜索', 'javascript:void(0)', class: 'fl task-btn task-btn-orange ml5 mt10 search-btn' %> + <%= link_to '清除', 'javascript:void(0)', class: 'fl task-btn ml5 mt2 mt10 reset-btn' %> +
    + \ No newline at end of file diff --git a/app/views/managements/schools/_data_contrast_list.html.erb b/app/views/managements/schools/_data_contrast_list.html.erb new file mode 100644 index 00000000..0a9ee965 --- /dev/null +++ b/app/views/managements/schools/_data_contrast_list.html.erb @@ -0,0 +1,72 @@ +
    +
    + 学校数据统计（<%= I18n.t("school_daily_report.#{params[:contrast_column]}") %>变化统计情况） +
    + <%= select_tag :contrast_column, + options_for_select(@select_options, params[:contrast_column]), + class: 'fl task-height-30 contrast-column-select', + style: 'position: absolute; right: 30px; top: 15px;' %> +
    + + + + + + + + + + + + + + <% @reports.each_with_index do |report, index| %> + + + + + + + <% if report['increase'] > 0 %> + + + <% elsif report['increase'].zero? %> + + + <% else %> + + + <% end %> + + <% end %> + +
    序号ID单位名称时段一
    <%= "（#{params[:begin_date]}至#{params[:end_date]}）" %>    		时段二
    <%= "（#{params[:other_begin_date]}至#{params[:other_end_date]}）" %>    		 + <%= sort_tag('变化情况', name: 'percentage', path: school_data_contrast_managements_path) %> +
    （ 新 增 数 | 新增百分比） +
    <%= (@obj_pages.page - 1) * @obj_pages.per_page + index + 1 %><%= report.school_id %><%= report.school_name %><%= report['total'] %><%= report['other_total'] %> + +<%= report['increase'] %> + +<%= report['percentage'] %>% + <%= report['increase'] %> + <%= report['percentage'] %> + <%= report['increase'] %> + <%= report['percentage'] %>%
    + +
    +
    +
      + <%= pagination_links_full @obj_pages, @obj_count, per_page_links: false, remote: true, flag: true, is_new: true, path: school_data_contrast_managements_path(params.except(:page)) %> +
    +
    +
    +
    + \ No newline at end of file diff --git a/app/views/managements/schools/_statistics_list.html.erb b/app/views/managements/schools/_statistics_list.html.erb index 1675e6f1..609a1cca 100644 --- a/app/views/managements/schools/_statistics_list.html.erb +++ b/app/views/managements/schools/_statistics_list.html.erb @@ -15,10 +15,9 @@ - <% @schools.as_json.each_with_index do |data, index| %> + <% @schools.each_with_index do |school, index| %> - <% school = data["school"] %> - <%= (@obj_pages.page - 1) * @obj_pages.per_page + index + 1 %> + <% p school %><%= (@obj_pages.page - 1) * @obj_pages.per_page + index + 1 %> <%= school['id'] %> <%= school['name'] %> <%= school['teacher_count'] %> diff --git a/app/views/managements/schools/_yesterday_data_list.html.erb b/app/views/managements/schools/_yesterday_data_list.html.erb new file mode 100644 index 00000000..51c4bbdc --- /dev/null +++ b/app/views/managements/schools/_yesterday_data_list.html.erb @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + <% @reports.each_with_index do |report, index| %> + + + + + + + + + + + <% end %> + +
    序号ID单位名称<%= sort_tag('新增教师', name: 'teacher_increase_count', path: school_yesterday_data_managements_path) %><%= sort_tag('新增学生', name: 'student_increase_count', path: school_yesterday_data_managements_path) %><%= sort_tag('新增课堂', name: 'course_increase_count', path: school_yesterday_data_managements_path) %><%= sort_tag('新增实训', name: 'shixun_increase_count', path: school_yesterday_data_managements_path) %><%= sort_tag('活跃用户', name: 'active_user_count', path: school_yesterday_data_managements_path) %>
    <%= (@obj_pages.page - 1) * @obj_pages.per_page + index + 1 %><%= report.school_id %><%= report.school_name %><%= report.teacher_increase_count %><%= report.student_increase_count %><%= report.course_increase_count %><%= report.shixun_increase_count %><%= report.active_user_count %>
    + +
    +
    +
      + <%= pagination_links_full @obj_pages, @obj_count, per_page_links: false, remote: true, flag: true, is_new: true, path: school_yesterday_data_managements_path(params.except(:page)) %> +
    +
    +
    +
    \ No newline at end of file diff --git a/app/views/managements/schools/data_contrast.js.erb b/app/views/managements/schools/data_contrast.js.erb new file mode 100644 index 00000000..a7c2746f --- /dev/null +++ b/app/views/managements/schools/data_contrast.js.erb @@ -0,0 +1,2 @@ +$("#managements-school-data").html("<%= j(render 'managements/schools/data_contrast_list') %>") +$(".management-school-data-form-box").html("<%= j(render 'managements/schools/contrast_search_form') %>") \ No newline at end of file diff --git a/app/views/managements/schools/yesterday_data.html.erb b/app/views/managements/schools/yesterday_data.html.erb new file mode 100644 index 00000000..af96997d --- /dev/null +++ b/app/views/managements/schools/yesterday_data.html.erb @@ -0,0 +1,9 @@ +
    +
    + <%= render 'managements/schools/contrast_search_form' %> +
    +
    + +
    + <%= render 'managements/schools/yesterday_data_list'%> +
    \ No newline at end of file diff --git a/app/views/managements/schools/yesterday_data.js.erb b/app/views/managements/schools/yesterday_data.js.erb new file mode 100644 index 00000000..1a9a8ebb --- /dev/null +++ b/app/views/managements/schools/yesterday_data.js.erb @@ -0,0 +1,2 @@ +$("#managements-school-data").html("<%= j(render 'managements/schools/yesterday_data_list') %>") +$(".management-school-data-form-box").html("<%= j(render 'managements/schools/contrast_search_form') %>") \ No newline at end of file diff --git a/config/locales/school_daily_reports/zh.yml b/config/locales/school_daily_reports/zh.yml new file mode 100644 index 00000000..57caf343 --- /dev/null +++ b/config/locales/school_daily_reports/zh.yml @@ -0,0 +1,7 @@ +zh: + school_daily_report: + teacher_increase_count: 新增教师 + student_increase_count: 新增学生 + course_increase_count: 新增课堂 + shixun_increase_count: 新增实训 + active_user_count: 活跃用户 \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index c2ed181b..26cddf96 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -726,6 +726,8 @@ RedmineApp::Application.routes.draw do ## oauth相关 delete :delete_partner get :customers_list get :school_report, controller: 'managements::schools', action: 'statistics' + get :school_yesterday_data, controller: 'managements::schools', action: 'yesterday_data' + get :school_data_contrast, controller: 'managements::schools', action: 'data_contrast' end end # Enable Grack support diff --git a/config/schedule.rb b/config/schedule.rb new file mode 100644 index 00000000..380494c6 --- /dev/null +++ b/config/schedule.rb @@ -0,0 +1,24 @@ +# Use this file to easily define all of your cron jobs. +# +# It's helpful, but not entirely necessary to understand cron before proceeding. +# http://en.wikipedia.org/wiki/Cron + +# Example: +# +# set :output, "/path/to/my/cron_log.log" +# +# every 2.hours do +# command "/usr/bin/some_great_command" +# runner "MyModel.some_method" +# rake "some:great:rake:task" +# end +# +# every 4.days do +# runner "AnotherModel.prune_old_records" +# end + +# Learn more: http://github.com/javan/whenever + +every 1.days, at: '5:00 am' do + runner 'StatisticSchoolDailyReportTask.new.call' +end diff --git a/db/migrate/20190425073829_create_school_daily_reports.rb b/db/migrate/20190425073829_create_school_daily_reports.rb new file mode 100644 index 00000000..e66f5722 --- /dev/null +++ b/db/migrate/20190425073829_create_school_daily_reports.rb @@ -0,0 +1,18 @@ +class CreateSchoolDailyReports < ActiveRecord::Migration + def change + create_table :school_daily_reports do |t| + t.integer :school_id + t.string :school_name + t.integer :teacher_increase_count + t.integer :student_increase_count + t.integer :course_increase_count + t.integer :shixun_increase_count + t.integer :active_user_count + + t.date :date + t.timestamps + end + + add_index :school_daily_reports, [:school_id, :date], unique: true + end +end diff --git a/lib/tasks/statistic_school_daily_report.rake b/lib/tasks/statistic_school_daily_report.rake new file mode 100644 index 00000000..84b65204 --- /dev/null +++ b/lib/tasks/statistic_school_daily_report.rake @@ -0,0 +1,103 @@ +#coding=utf-8 + +namespace :school_daily_report do + desc 'statistic school daily report data before now' + task :statistic, [:date] => :environment do |_, args| + date = Time.zone.parse(args[:date]).beginning_of_day + current_date = (Time.zone.now - 5.hour).beginning_of_day + custom_logger("statistic range: #{date}..#{current_date}") + + while current_date > date + date_str = date.strftime('%Y-%m-%d') + # 检查当天数据是否已经统计 + if SchoolDailyReport.exists?(date: date) + custom_logger("Skip! statistics data exist, date: #{date_str}") + date += 1.day + next + end + + school_count = School.count + query_times = school_count % query_size == 0 ? school_count / query_size : (school_count / query_size) + 1 + + custom_logger("Start statistic => Date: #{date_str}, school count: #{school_count}, insert times: #{query_times} ~") + query_times.times do |index| + sql = school_daily_report_sql(date, query_size, index * query_size) + reports = School.find_by_sql(sql) + + data = reports.map do |report| + [ + report['id'], report['name'], report['teacher_count'], report['student_count'], report['course_count'], + report['shixun_count'], report['active_user_count'], date_str, current_datetime, current_datetime + ] + end + batch_create_school_daily_reports!(data) + end + custom_logger("Statistic complete! date: #{date_str}") + + date += 1.day + end + end + + desc 'clear school daily report data' + task clear: :environment do + SchoolDailyReport.destroy_all + end + + def query_size + 100 + end + + def current_datetime + Time.zone.now.strftime('%Y-%m-%d %H:%M:%S') + end + + def custom_logger(str) + p(str) + end + + def batch_create_school_daily_reports!(arr) + sql = build_insert_report_sql(arr) + SchoolDailyReport.connection.execute(sql) + end + + def build_insert_report_sql(arr) + prefix = 'INSERT INTO school_daily_reports(school_id, school_name, teacher_increase_count, student_increase_count, '\ + 'course_increase_count, shixun_increase_count, active_user_count, date, created_at, updated_at) VALUES' + # [[1,2], [3,4]] => ['"1", "2"', '"3", "4"'] => '("1", "2"),("3", "4")' + values = '(' + arr.map { |item| '"' + item.join('","') + '"' }.join('),(') + ')' + + prefix + values + end + + def school_daily_report_sql(date, limit, offset) + begin_date = (date + 5.hour).strftime('%Y-%m-%d %H:%M:%S') + end_date = (date + 1.day + 5.hour).strftime('%Y-%m-%d %H:%M:%S') + + <<-SQL + SELECT schools.id, schools.name, ( + SELECT COUNT(*) FROM users u + LEFT JOIN user_extensions ue ON ue.user_id = u.id + WHERE ue.school_id = schools.id AND ue.identity = #{User::STUDENT} + AND u.created_on BETWEEN "#{begin_date}" AND "#{end_date}" + ) student_count, ( + SELECT COUNT(*) FROM users u + LEFT JOIN user_extensions ue ON ue.user_id = u.id + WHERE ue.school_id = schools.id AND ue.identity = #{User::TEACHER} + AND u.created_on BETWEEN "#{begin_date}" AND "#{end_date}" + ) teacher_count, ( + SELECT COUNT(*) FROM courses cs + WHERE cs.school_id = schools.id + AND cs.created_at BETWEEN "#{begin_date}" AND "#{end_date}" + ) course_count, ( + SELECT COUNT(*) FROM shixuns sx + LEFT JOIN users u ON sx.user_id = u.id + LEFT JOIN user_extensions ue ON ue.user_id = u.id + WHERE ue.school_id = schools.id AND sx.created_at BETWEEN "#{begin_date}" AND "#{end_date}" + ) shixun_count, ( + SELECT COUNT(*) FROM users u + LEFT JOIN user_extensions ue ON ue.user_id = u.id + WHERE ue.school_id = schools.id AND u.last_login_on BETWEEN "#{begin_date}" AND "#{end_date}" + ) active_user_count FROM schools LIMIT #{limit} OFFSET #{offset} + SQL + end +end