From 0ec08f936113c5ad6baf8eac3c2cc65be4347939 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 7 May 2015 11:47:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E9=9B=B6=E5=88=86=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E4=BB=8D=E5=9C=A8=E6=9C=AA=E6=89=B9=E4=BD=9C=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/bids_controller.rb            | 2 +-
 app/controllers/homework_attach_controller.rb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index b1cca68ed..c98df27d3 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -490,7 +490,7 @@ class BidsController < ApplicationController
               (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score,
               (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
               FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY s_score DESC,created_at ASC) AS table1
-              WHERE table1.t_score IS NULL OR table1.t_score = 0")
+              WHERE table1.t_score IS NULL")
           @not_batch_homework = true
           @cur_type = 1
         else
diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index 523e430fb..f6b044c63 100644
--- a/app/controllers/homework_attach_controller.rb
+++ b/app/controllers/homework_attach_controller.rb
@@ -51,7 +51,7 @@ class HomeworkAttachController < ApplicationController
       order_by = "created_at #{direction}"
     end
     all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*,
-            (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL AND stars > 0 ORDER BY updated_at DESC limit 0,1) AS t_score,
+            (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score,
             (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
             FROM homework_attaches WHERE bid_id = #{@bid.id}
             ORDER BY #{order_by}) AS table1
@@ -503,7 +503,7 @@ class HomeworkAttachController < ApplicationController
       get_not_batch_homework_list params[:cur_sort] || "s_socre",params[:cur_direction] || "desc",@homework.bid_id
     elsif @cur_type == "2" #老师已批列表
       @result_homework = HomeworkAttach.find_by_sql("SELECT homework_attaches.*,
-            (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL AND stars > 0 ORDER BY updated_at DESC limit 0,1) AS t_score,
+            (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score,
             (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
             FROM homework_attaches WHERE id = #{@homework.id}").first
     elsif @cur_type == "3" #全部作业列表
@@ -630,7 +630,7 @@ class HomeworkAttachController < ApplicationController
         (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
         FROM homework_attaches WHERE bid_id = #{bid_id}
         ORDER BY #{order_by}) AS table1
-        WHERE table1.t_score IS NULL OR table1.t_score = 0 ")
+        WHERE table1.t_score IS NULL ")
     @all_homework_list = search_homework_member(@all_homework_list,@search_name.to_s.downcase) if @search_name
     # @homework_list = paginateHelper @all_homework_list,10
     @homework_list = @all_homework_list