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

app/controllers/weapps/course_member_attendances_controller.rb

@@ -9,7 +9,7 @@ class Weapps::CourseMemberAttendancesController < ApplicationController
       @member_attendances = @member_attendances.joins(:course_member).where(course_members: {course_group_id: params[:group_ids]})
     end
     @member_attendances = @member_attendances.where(attendance_status: params[:attendance_status]) if params[:attendance_status].present?
-    @member_attendances = @member_attendances.joins(user: :user_extension).order("user_extensions.student_id asc")
+    @member_attendances = @member_attendances.joins(user: :user_extension).order("attendance_status=1 desc, course_member_attendances.updated_at desc,  user_extensions.student_id asc")
     @member_attendances = paginate @member_attendances.preload(user: :user_extension)
   end
 

lib/tasks/sync_evaluate.rake

@@ -0,0 +1,17 @@
+desc "同步学院或者单位评测数"
+
+namespace :sync_evaluate do
+  task outpus_count: :environment 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}'").first.try(:e_count)
+
+      report =  SchoolReport.find_or_initialize_by(school_id: school.id)
+      report.school_name = school.name
+      report.shixun_evaluate_count = evaluate_count
+
+      report.save
+    end
+  end
+end