From 8813444aecdb254e9e1ba574b58ff96b7d5495e3 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 20 Nov 2019 16:09:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_commons_controller.rb         | 6 ++----
 db/migrate/20191120080224_migrate_eff_score_default.rb | 5 +++++
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20191120080224_migrate_eff_score_default.rb

diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index a8a586759..062e4877f 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -627,10 +627,8 @@ class HomeworkCommonsController < ApplicationController
           @homework.save!
           if score_change && @homework.end_or_late_none_group
             UpdateShixunWorkScoreJob.perform_now(@homework.id)
-          end
-
-          # 更新所有学生的效率分(作业允许补交且补交已截止 或者 作业不允许补交且提交已截止)
-          if !score_change && update_eff_score && @homework.end_or_late_none_group
+          elsif update_eff_score && (@homework.end_or_late_none_group || @homework.max_efficiency > 0)
+            # 更新所有学生的效率分(作业允许补交且补交已截止 或者 作业不允许补交且提交已截止 或者作业已计算过效率分)
             HomeworksService.new.update_student_eff_score HomeworkCommon.find_by(id: @homework.id)
           end
 
diff --git a/db/migrate/20191120080224_migrate_eff_score_default.rb b/db/migrate/20191120080224_migrate_eff_score_default.rb
new file mode 100644
index 000000000..0561eb646
--- /dev/null
+++ b/db/migrate/20191120080224_migrate_eff_score_default.rb
@@ -0,0 +1,5 @@
+class MigrateEffScoreDefault < ActiveRecord::Migration[5.2]
+  def change
+    change_column :homework_commons, :eff_score, :float, default: 0
+  end
+end