From c2d60b8958d88168090af233e884db102cb4f584 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 29 Apr 2016 16:38:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E4=BC=98=E5=85=88=E7=9A=84?=
 =?UTF-8?q?=E8=BF=9F=E4=BA=A4=E6=89=A3=E5=88=86=E5=92=8C=E7=BC=BA=E8=AF=84?=
 =?UTF-8?q?=E6=89=A3=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_evaluation_un_work.html.erb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 860c5936b..8e1c16264 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -94,9 +94,13 @@
           作品最终评分为
           <span class="c_red">&nbsp;<%= student_work.final_score%>&nbsp;</span>分。
           迟交扣分
-          <span class="c_red">&nbsp;<%= student_work.late_penalty%>&nbsp;</span>分，
+          <span class="c_red">&nbsp;
+            <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.late_penalty %>
+            &nbsp;</span>分，
           缺评扣分
-          <span class="c_red">&nbsp;<%= student_work.absence_penalty%>&nbsp;</span>分，
+          <span class="c_red">&nbsp;
+            <%= student_work.homework_common && student_work.homework_common.teacher_priority == 1 && student_work.teacher_score ? 0 : student_work.absence_penalty%>
+            &nbsp;</span>分，
           最终成绩为
           <span class="c_red">&nbsp;<%= format("%.1f",score<0 ? 0 : score)%>&nbsp;</span>分。
         </div>