From 3839e8be60316a0fbda7388e6c081834d6d086cd Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 15 Mar 2019 14:08:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...90314080805_create_shixun_student_works.rb | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/db/migrate/20190314080805_create_shixun_student_works.rb b/db/migrate/20190314080805_create_shixun_student_works.rb
index e0ebaec9..2861f22e 100644
--- a/db/migrate/20190314080805_create_shixun_student_works.rb
+++ b/db/migrate/20190314080805_create_shixun_student_works.rb
@@ -14,15 +14,15 @@ class MigrateShixunWorks1 < ActiveRecord::Migration
   end
 
   def up
-    begin
-      works = StudentWork.where("myshixun_id != 0 and myshixun_id not in (select id from myshixuns) and (work_score is null or work_score = 0)")
-      works.update_all(:myshixun_id => 0, :work_status => 0, :work_score => nil, :final_score => nil,
-                       :cost_time => 0, :update_time => nil, :compelete_status => 0, :commit_time => nil)
+    works = StudentWork.where("myshixun_id != 0 and myshixun_id not in (select id from myshixuns) and (work_score is null or work_score = 0)")
+    works.update_all(:myshixun_id => 0, :work_status => 0, :work_score => nil, :final_score => nil,
+                     :cost_time => 0, :update_time => nil, :compelete_status => 0, :commit_time => nil)
 
-      shixun_works = StudentWork.where("myshixun_id != 0 and myshixun_id not in (select id from myshixuns) and work_score > 0")
-      shixun_works.each do |work|
-        shixun = work.homework_common.try(:homework_commons_shixuns).try(:shixun)
-        user = work.user
+    shixun_works = StudentWork.where("myshixun_id != 0 and myshixun_id not in (select id from myshixuns) and work_score > 0")
+    shixun_works.each do |work|
+      shixun = work.homework_common.try(:homework_commons_shixuns).try(:shixun)
+      user = work.user
+      begin
         ActiveRecord::Base.transaction do
           if shixun.present? && user.present?
             # 创建新的myshixun和games
@@ -81,11 +81,11 @@ class MigrateShixunWorks1 < ActiveRecord::Migration
             end
           end
         end
+      rescue Exception => e
+        puts ("###failed to exec shixun: current task id is #{e}")
+        # g.delete_project(gshixun.id) if gshixun.try(:id).present?
+        raise ActiveRecord::Rollback
       end
-    rescue Exception => e
-      puts ("###failed to exec shixun: current task id is #{e}")
-      # g.delete_project(gshixun.id) if gshixun.try(:id).present?
-      raise ActiveRecord::Rollback
     end
   end