From f39d7e374a5ca23ddc377d9d12390d28c30ed6cf Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 30 Oct 2014 14:41:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=99=E5=B8=88=E8=AF=84?=
 =?UTF-8?q?=E5=88=86=E4=B8=BA=E6=89=80=E6=9C=89=E6=95=99=E5=B8=88=E7=9A=84?=
 =?UTF-8?q?=E5=B9=B3=E5=9D=87=E8=AF=84=E5=88=86(=E5=8C=85=E6=8B=AC?=
 =?UTF-8?q?=E9=9D=9E=E4=B8=BB=E8=AE=B2=E6=95=99=E5=B8=88)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/bids_controller.rb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index a45b64c8c..1184cb275 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -497,11 +497,20 @@ class BidsController < ApplicationController
         #@homework_list = @bid.homeworks
         #增加作业按评分排序，
         #@homework_list = @bid.homeworks.eager_load(:rate_averages, :user, :attachments).order('seems_rateable_cached_ratings.avg DESC').order("#{HomeworkAttach.table_name}.created_at ASC")
+        teachers = "("
+        teacher_members = searchTeacherAndAssistant(@bid.courses.first)
+        teacher_members.each do |member|
+          if member == teacher_members.last
+            teachers += member.user_id.to_s + ")"
+          else
+            teachers += member.user_id.to_s + ","
+          end
+        end
          all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
-            (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{@bid.author_id}) AS t_score,
-            (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id <> #{@bid.author_id}) AS s_score
+            (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id in #{teachers}) AS t_score,
+            (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id not in #{teachers}) AS s_score
             FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY
-            (CASE WHEN t_score IS NULL THEN 0 ELSE t_score * #{teacher_proportion} END + CASE WHEN s_score IS NULL THEN 0 ELSE s_score * #{1 - teacher_proportion} END) DESC,created_at ASC")
+            s_score DESC,created_at ASC")
 
         limit =  10
         feedback_count = all_homework_list.count