From f78595bbbbfb801f4a11f209941784e538d15426 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 1 Sep 2016 17:11:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=AD=A6=E6=A0=A1=E5=88=97=E8=A1=A8=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=8C=89=E7=94=A8=E6=88=B7=E6=95=B0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb | 13 ++++++++++++-
 app/helpers/school_helper.rb        |  2 +-
 app/views/admin/schools.html.erb    |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 334101bb0..3f49abb23 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -599,8 +599,19 @@ class AdminController < ApplicationController
 
   #学校列表
   def schools
-
+    @order = ""
+    @sort = ""
     @schools = School.find_by_sql("SELECT * FROM schools ORDER BY created_at DESC")
+    if params[:sort] && (params[:order]  == 'num')
+      @order = params[:order]
+      @sort = params[:sort]
+      @schools.each do |school|
+        count = UserExtensions.where("school_id = #{school.id} or occupation = '#{school.name}'").count
+        school[:infocount] = count.to_i
+      end
+      @sort == 'asc' ? (@schools = @schools.sort{|x,y| x[:infocount] <=> y[:infocount] }) : (@schools = @schools.sort{|x,y| y[:infocount] <=> x[:infocount]})
+    end
+
     @school_count = @schools.count
 
     @school_pages = Paginator.new @school_count, 30, params['page'] || 1
diff --git a/app/helpers/school_helper.rb b/app/helpers/school_helper.rb
index 075d2b039..daa0550ef 100644
--- a/app/helpers/school_helper.rb
+++ b/app/helpers/school_helper.rb
@@ -1,6 +1,6 @@
 module SchoolHelper
   def schoolMember_num school
-    count = student_num(school) + teacher_num(school)
+    count = UserExtensions.where("school_id = #{school.id} or occupation = '#{school.name}'").count
     count.to_s
   end
 
diff --git a/app/views/admin/schools.html.erb b/app/views/admin/schools.html.erb
index f52d1f060..42bec6551 100644
--- a/app/views/admin/schools.html.erb
+++ b/app/views/admin/schools.html.erb
@@ -20,8 +20,8 @@
       <th style="width: 100px;">
         学校名称
       </th>
-      <th style="width: 35px;">
-        用户数
+      <th style="width: 35px;" class = "<%= @order == 'num' ? (@sort == 'desc' ? 'st_up' : (@sort == 'asc' ? 'st_down' : '')) : '' %>">
+        <%= link_to '用户数', admin_schools_path(:sort=> @sort == "desc" ? 'asc' : 'desc', :order => 'num') %>
       </th>
       <th style="width: 90px;">
         创建时间