From 555b1f8dc0dc08c68a5773a8edcb13bd18f1f541 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 25 Jun 2019 17:46:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=9A=84=E6=9C=80=E5=A4=A7=E6=95=88=E7=8E=87=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/homeworks_service.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/services/homeworks_service.rb b/app/services/homeworks_service.rb
index 2d6f50b5c..1e155dde0 100644
--- a/app/services/homeworks_service.rb
+++ b/app/services/homeworks_service.rb
@@ -111,7 +111,7 @@ class HomeworksService
         if homework.work_efficiency
           if homework.max_efficiency < student_work.efficiency
             # homework.max_efficiency = student_work.efficiency
-            homework.update_column("max_efficiency", homework.max_efficiency)
+            homework.update_column("max_efficiency", student_work.efficiency)
           end
           # eff_score = homework.max_efficiency == 0 ? 0 : student_work.efficiency / homework.max_efficiency * homework.eff_score
           # student_work.eff_score = format("%.2f", eff_score)
@@ -200,7 +200,7 @@ class HomeworksService
 
               # 如果作业的最大效率值有变更则更新所有作品的效率分
               if homework.work_efficiency && homework.max_efficiency < work.efficiency
-                homework.update_column("max_efficiency", homework.max_efficiency)
+                homework.update_column("max_efficiency", work.efficiency)
               end
             end
 

From cc1d09bee79e53efd7beb55e48a87f1e6b410cd3 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 25 Jun 2019 18:03:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=AE=9E=E8=AE=AD?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E8=8E=B7?=
 =?UTF-8?q?=E5=BE=97=E7=9A=84=E6=80=BB=E7=BB=8F=E9=AA=8C=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_works/shixun_work.json.jbuilder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/student_works/shixun_work.json.jbuilder b/app/views/student_works/shixun_work.json.jbuilder
index 3b6b598cb..74c33420e 100644
--- a/app/views/student_works/shixun_work.json.jbuilder
+++ b/app/views/student_works/shixun_work.json.jbuilder
@@ -15,6 +15,7 @@ json.efficiency number_with_precision @work.efficiency, precision: 2
 json.max_efficiency number_with_precision @homework.max_efficiency, precision: 2
 json.passed_time @myshixun.passed_time
 json.total_spend_time @myshixun.total_spend_time
+json.user_score @myshixun.total_score
 
 # 关卡完成情况
 index = 1

From 9ca32a6d1a1a8bfb28c929ca13ff061baff4dca2 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 25 Jun 2019 18:10:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=BE=E7=89=87url=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b4e3baf51..32c4438a6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -128,7 +128,7 @@ module ApplicationHelper
       if source.class.to_s == 'User'
         File.join(relative_path, ["#{source.class}", "#{source.id}"])
       else
-        File.join("/images/avatars", ["#{source.class}", "#{source.id}"])
+        File.join("images/avatars", ["#{source.class}", "#{source.id}"])
       end
     elsif source.class.to_s == 'User'
       str = source.user_extension.try(:gender).to_i == 0 ? "b" : "g"
@@ -146,7 +146,7 @@ module ApplicationHelper
 
   def shixun_url_to_avatar(shixun)
     if File.exist?(disk_filename(shixun.class, shixun.id))
-      File.join("/images/#{relative_path}", "#{shixun.class}", "#{shixun.id}")
+      File.join("images/#{relative_path}", "#{shixun.class}", "#{shixun.id}")
     else
       File.join("educoder", "index", "shixun", "shixun#{rand(23)}.jpg")
     end