From 2c021417dcf0c06ad336e520805f0e14fdfddb53 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 17 Jul 2019 15:27:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=80=97=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/myshixuns_controller.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index 60edb6dcb..a7c1e227c 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -98,7 +98,8 @@ class MyshixunsController < ApplicationController
         sec_key = jsonTestDetails['sec_key']
 
         res_usage = jsonTestDetails['resUsage']
-        ts_time = res_usage['test_set_time_1']
+        # 关卡测试集的总耗时
+        ts_time = 0
 
         logger.info("training_task_status start#1**#{game_id}**** #{Time.now.strftime("%Y-%m-%d %H:%M:%S.%L")}")
         resubmit = jsonTestDetails['resubmit']
@@ -123,11 +124,13 @@ class MyshixunsController < ApplicationController
           jenkins_testsets.each_with_index do |j_test_set, i|
             logger.info("j_test_set: ############## #{j_test_set}")
             actual_output = tran_base64_decode64(j_test_set['output'])
+            ts_time += j_test_set['testSetTime'].to_i
+
             # is_public = test_sets.where(:position => j_test_set['caseId']).first.try(:is_public)
             logger.info "actual_output:################################################# #{actual_output}"
             Output.create!(:code => status, :game_id => game_id, :out_put => outPut, :test_set_position => j_test_set['caseId'],
                            :actual_output => actual_output, :result => j_test_set['passed'].to_i, :query_index => max_query_index,
-                           :compile_success => compile_success.to_i, :sec_key => sec_key)
+                           :compile_success => compile_success.to_i, :sec_key => sec_key, :ts_time => j_test_set['testSetTime'])
             # 如果设置了按测试集给分,则需要统计测试集的分值
             if challenge.test_set_score && j_test_set['passed'].to_i == 1
               test_set_score += challenge.test_sets.where(:position => j_test_set['caseId']).pluck(:score).first