From 9767091ba43aef4f5c67a6a944364a8531823e92 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 21 Oct 2019 22:40:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercises_controller.rb       |  2 +-
 app/helpers/exercises_helper.rb               |  2 +-
 app/tasks/exercise_publish_task.rb            |  2 +-
 ...141738_migrate_exercise_challenge_score.rb | 25 +++++++++++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20191021141738_migrate_exercise_challenge_score.rb

diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index d71b72618..99356946f 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -1129,7 +1129,7 @@ class ExercisesController < ApplicationController
               :subjective_score => subjective_score,
               :commit_method => @answer_committed_user&.commit_method.to_i > 0 ? @answer_committed_user&.commit_method.to_i : params[:commit_method].to_i
             }
-            @answer_committed_user.update_attributes(commit_option)
+            @answer_committed_user.update_attributes!(commit_option)
             CommitExercsieNotifyJobJob.perform_later(@exercise.id, current_user.id)
             normal_status(0,"试卷提交成功！")
           else
diff --git a/app/helpers/exercises_helper.rb b/app/helpers/exercises_helper.rb
index 395d67913..eadbfa05c 100644
--- a/app/helpers/exercises_helper.rb
+++ b/app/helpers/exercises_helper.rb
@@ -414,7 +414,7 @@ module ExercisesHelper
     score2 = 0.0 #填空题
     score5 = 0.0  #实训题
     ques_stand = []  #问题是否正确
-    exercise_questions = exercise.exercise_questions.includes(:exercise_answers,:exercise_shixun_answers,:exercise_standard_answers,:exercise_shixun_challenges)
+    exercise_questions = exercise.exercise_questions.includes(:exercise_standard_answers,:exercise_shixun_challenges)
     exercise_questions&.each do |q|
       begin
         if q.question_type != 5
diff --git a/app/tasks/exercise_publish_task.rb b/app/tasks/exercise_publish_task.rb
index a7b533d05..4e34320ea 100644
--- a/app/tasks/exercise_publish_task.rb
+++ b/app/tasks/exercise_publish_task.rb
@@ -69,7 +69,7 @@ class ExercisePublishTask
                 :subjective_score => subjective_score,
                 :commit_method => exercise_user&.commit_method.to_i > 0 ? exercise_user&.commit_method.to_i : 3
             }
-            exercise_user.update_attributes(commit_option)
+            exercise_user.update_attributes!(commit_option)
           end
         rescue Exception => e
           Rails.logger.info("rescue errors ___________________________#{e}")
diff --git a/db/migrate/20191021141738_migrate_exercise_challenge_score.rb b/db/migrate/20191021141738_migrate_exercise_challenge_score.rb
new file mode 100644
index 000000000..6d67398db
--- /dev/null
+++ b/db/migrate/20191021141738_migrate_exercise_challenge_score.rb
@@ -0,0 +1,25 @@
+class MigrateExerciseChallengeScore < ActiveRecord::Migration[5.2]
+  include ExercisesHelper
+  def change
+    exercise = Exercise.find_by(id: 2734)
+    if exercise
+      exercise.exercise_users.where("start_at is not null").each do |exercise_user|
+        if exercise_user.end_at.nil?
+          calculate_score = calculate_student_score(exercise, exercise_user.user)[:total_score]
+          subjective_score = exercise_user.subjective_score
+          total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
+          total_score = calculate_score + total_score_subjective_score
+          exercise_user.update_attributes!(score:total_score,objective_score:calculate_score,end_at:exercise.end_time,commit_status:1,status:1,commit_method:3)
+          puts exercise_user.id
+        else
+          calculate_score = ExerciseShixunAnswer.where(user_id: exercise_user.user_id, exercise_question_id: exercise.exercise_questions.pluck(:id)).pluck(:score).sum
+          subjective_score = exercise_user.subjective_score
+          total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
+          total_score = calculate_score + total_score_subjective_score
+          exercise_user.update_attributes!(score:total_score,objective_score:calculate_score) if total_score > exercise_user.score
+          puts exercise_user.id
+        end
+      end
+    end
+  end
+end