From 99d9a288285b59d70b1a635a494d832a11540477 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 10 May 2016 11:33:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E5=B8=88=E6=A6=9Csql=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb     | 2 +-
 app/helpers/organizations_helper.rb             | 6 +++++-
 app/models/school.rb                            | 1 +
 app/views/organizations/_show_teachers.html.erb | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 561ebf8a8..07bd55321 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -103,7 +103,7 @@ class OrganizationsController < ApplicationController
           @org_subfield = OrgSubfield.find(params[:org_subfield_id])
           if @org_subfield.field_type == "Comptec" || @org_subfield.field_type == "Compstu"
             #@org_students = User.find_by_sql("SELECT * FROM users u, user_extensions ue where u.id = ue.user_id and ue.identity =1;")
-            @org_teachers = User.find_by_sql("SELECT * FROM users u, user_extensions ue where u.id = ue.user_id and ue.identity =0;")
+            @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 order by course_count desc")
           else
             @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
             @org_activities = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index f84c71a59..d2974baae 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -170,7 +170,11 @@ module OrganizationsHelper
   end
 
   def org_teacher_resource_count user
-    results = Attachment.find_by_sql("SELECT * FROM `attachments` where author_id = #{user.user_id};")
+    results = Attachment.find_by_sql("SELECT count(*) FROM attachments where author_id = #{user.id};").count
+  end
+
+  def org_teacher_course_count user
+    results = Course.find_by_sql("select count(*) from courses where courses.tea_id = #{user.id}").count
   end
 
 end
diff --git a/app/models/school.rb b/app/models/school.rb
index 6cafb0473..b9a1d88cb 100644
--- a/app/models/school.rb
+++ b/app/models/school.rb
@@ -5,4 +5,5 @@ class School < ActiveRecord::Base
   def to_s
   	self.name.to_s
   end
+
 end
diff --git a/app/views/organizations/_show_teachers.html.erb b/app/views/organizations/_show_teachers.html.erb
index 28e308b49..9418b861f 100644
--- a/app/views/organizations/_show_teachers.html.erb
+++ b/app/views/organizations/_show_teachers.html.erb
@@ -23,7 +23,7 @@
                   <span class="f12 fontGrey2"><%= org_teacher.technical_title %></span></div>
               <% end %>
             <div class="teacher-social-block">
-              <div class="block-num"><%= User.current.courses.count %></div>
+              <div class="block-num"><%= org_teacher.courses.count %></div>
               <div class="block-title">课程数</div>
             </div>
             <div class="block-slice"></div>
@@ -33,7 +33,7 @@
             </div>
             <div class="block-slice"></div>
             <div class="teacher-social-block">
-              <div class="block-num"><%= org_teacher_resource_count(org_teacher) %>8000</div>
+              <div class="block-num"><%= org_teacher_resource_count(org_teacher) %></div>
               <div class="block-title">资源数</div>
             </div>
           </div>