From a4d6920534d436d7888edb396e4de1b7a7e26552 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 5 Sep 2019 17:15:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=B0=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E8=80=81=E5=B8=88=E7=9A=84=E7=9F=AD=E4=BF=A1=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/users/update_account_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/users/update_account_service.rb b/app/services/users/update_account_service.rb
index 3f0aa8cc8..fad1210a5 100644
--- a/app/services/users/update_account_service.rb
+++ b/app/services/users/update_account_service.rb
@@ -53,7 +53,7 @@ class Users::UpdateAccountService < ApplicationService
       RewardGradeService.call(user, container_id: user.id, container_type: 'Account', score: 500)
       if user.user_extension.teacher?
         join_course(user.id,1309, 2)
-        sms_notify_admin(user.lastname)
+        # sms_notify_admin(user.lastname)
       end
     end
 

From beaaa944d041b0a42ac571f512bbe2d11834f696 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 5 Sep 2019 17:29:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=88=90=E7=BB=A9=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/export_helper.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/helpers/export_helper.rb b/app/helpers/export_helper.rb
index f17ede53c..05b1b2f8b 100644
--- a/app/helpers/export_helper.rb
+++ b/app/helpers/export_helper.rb
@@ -113,7 +113,7 @@ module ExportHelper
       end
     else   #实训题
       shixun = homework.shixuns.first
-      shixun_head_cells = %w(完成情况 通关时间 总耗时 总评测次数 获得经验值 关卡得分)
+      shixun_head_cells = %w(完成情况 通关时间 学员在EduCoder做实训花费的时间 总评测次数 获得经验值 关卡得分)
       eff_boolean = homework.work_efficiency
       if eff_boolean
         eff_score_cell = ["效率分"]
@@ -123,7 +123,7 @@ module ExportHelper
       if allow_late_boolean  #允许迟交
         eff_score_cell.push("迟交扣分")
       end
-      shixun_time_cells = %w(最终成绩 更新时间 提交耗时 评语)
+      shixun_time_cells = %w(最终成绩 更新时间 作业发布到学员完成作业所耗的时间 评语)
       @work_head_cells = (head_cells_format + shixun_head_cells + eff_score_cell + shixun_time_cells).reject(&:blank?)
       works.includes(:student_works_scores, user: :user_extension, myshixun: :games).each_with_index do |w, index|
         myshixun = w.try(:myshixun)
@@ -163,7 +163,8 @@ module ExportHelper
         end
         w_15 = w.work_score.nil? ? "--" : w.work_score.round(1)
         w_16 = w.update_time ? format_time(w.update_time) : "--"  "更新时间"
-        w_17 = w.cost_time ? (game_spend_time w.cost_time) : "--"
+        myshixun_complete = myshixun && myshixun.status == 1
+        w_17 = myshixun_complete && w.cost_time ? (game_spend_time w.cost_time) : "未完成"
         teacher_comments = w.student_works_scores
         if teacher_comments.present?
           w_18 = ""