From d61eb60aba4dd670e8c22defb596a3de9399a6e4 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 31 Oct 2014 09:17:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BD=9C=E4=B8=9A=E5=A2=9E=E5=8A=A0=E6=8C=89?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E8=AF=84=E5=88=86=E7=9A=84=E5=8D=87?=
 =?UTF-8?q?=E5=BA=8F=E3=80=81=E9=99=8D=E5=BA=8F=E6=8E=92=E5=88=97=202.?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=87=E5=BA=8F=E3=80=81=E9=99=8D=E5=BA=8F?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=88=A4=E6=96=AD=E5=8F=82=E6=95=B0=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_attach_controller.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index ff26d45b0..740823c81 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/app/controllers/homework_attach_controller.rb
@@ -12,13 +12,13 @@ class HomeworkAttachController < ApplicationController
   #获取未批作业列表
   def get_not_batch_homework
     sort, direction = params[:sort], params[:direction]
-    order_by = sort == 'score'? "s_score #{direction}" : "created_at #{direction}"
-    
+    order_by = sort == 'socre'? "s_score #{direction}" : "created_at #{direction}"
     teachers = find_course_teachers @course
     all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*,
         (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 #{order_by}) AS table1
+        FROM homework_attaches WHERE bid_id = #{@bid.id}
+        ORDER BY #{order_by}) AS table1
         WHERE table1.t_score IS NULL")
 
     @homework_list = paginateHelper all_homework_list,10
@@ -31,13 +31,14 @@ class HomeworkAttachController < ApplicationController
   #获取已评作业列表
   def get_batch_homeworks
     sort, direction = params[:sort], params[:direction]
-    teachers = find_course_teachers @course
     teacher_proportion = get_teacher_proportion @bid
+    order_by = sort == 'socre'? "(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) #{direction}" : "created_at #{direction}"
+    teachers = find_course_teachers @course
     all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*,
             (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN #{teachers} and stars IS NOT NULL) 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) AS table1
+            ORDER BY #{order_by}) AS table1
             WHERE table1.t_score IS NOT NULL")
     @homework_list = paginateHelper all_homework_list,10
     @direction = direction == 'asc'? 'desc' : 'asc'
@@ -49,13 +50,14 @@ class HomeworkAttachController < ApplicationController
   #获取所有作业列表
   def get_homeworks
     sort, direction = params[:sort], params[:direction]
-    teachers = find_course_teachers @course
     teacher_proportion = get_teacher_proportion @bid
+    order_by = sort == 'socre'? "(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) #{direction}" : "created_at #{direction}"
+    teachers = find_course_teachers @course
     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 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")
+            ORDER BY #{order_by}")
     @homework_list = paginateHelper all_homework_list,10
     @direction = direction == 'asc'? 'desc' : 'asc'
     respond_to do |format|