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

app/controllers/subjects_controller.rb

@@ -458,30 +458,19 @@ class SubjectsController < ApplicationController
   end
 
   def statistics_info
-    # data = Subjects::DataStatisticService.new(@subject)
-    # Rails.logger.info("study_count: #{data.study_count}")
-    # Rails.logger.info("course_study_count: #{ data.course_study_count}")
-    # Rails.logger.info("passed_count: #{data.passed_count}")
-    # Rails.logger.info("course_used_count: #{data.course_used_count}")
-    # Rails.logger.info("school_used_count: #{data.school_used_count}")
-
-    # data_1 = Subjects::CourseUsedInfoService.call(@subject)
-    # Rails.logger.info("study_count: #{data_1}")
-
-    # data_2 = Subjects::ShixunUsedInfoService.call(@subject)
-    # Rails.logger.info("study_count: #{data_2}")
-
-    # data_3 = Subjects::UserUsedInfoService.call(@subject)
-    # Rails.logger.info("study_count: #{data_3}")
-
     @data =
         if params[:type] == "shixun_info"
           @subject.subject_shixun_infos
         elsif params[:type] == "user_info"
           @subject.subject_user_infos
         else
+          select_sql = "id, count(subject_course_records.id) total, sum(course_count) course_count, sum(student_count) student_count, " +
+              "sum(choice_shixun_num) choice_shixun_num, sum(choice_shixun_frequency) choice_shixun_frequency"
+          @total = @subject.subject_course_records.select("#{select_sql}").first
           @subject.subject_course_records
         end
+
+    @data_count = @data.count
     @data = paginate custom_sort(@data, params[:sort_by], params[:sort_direction])
 
   end

app/views/subjects/statistics_info.json.jbuilder

@@ -3,4 +3,6 @@ json.message "success"
 json.data do
   json.subject_info @subject.subject_record
   json.other_info @data
+  json.total_count @data_count
+  json.total @total
 end

config/harmonious_dictionary/chinese_dictionary.txt

@@ -613,7 +613,6 @@ a级情片
 大史纪
 戴相龙
 弹劾
-登辉
 邓笑贫
 迪里夏提
 地下教会