From 1fcd4283d97fda49ca71ce1310a0e2184f976a26 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 21 Aug 2019 09:06:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A=E6=88=90?=
 =?UTF-8?q?=E7=BB=A9=E7=9A=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/homeworks_service.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/services/homeworks_service.rb b/app/services/homeworks_service.rb
index ab149403d..59bd5dad4 100644
--- a/app/services/homeworks_service.rb
+++ b/app/services/homeworks_service.rb
@@ -328,7 +328,11 @@ class HomeworksService
       work.late_penalty = work.work_status == 2 ? homework.late_penalty : 0
       work.commit_time = myshixun.created_at > setting_time.publish_time ? setting_time.publish_time : myshixun.created_at
       work.myshixun_id = myshixun.id
-      work.update_time = myshixun.updated_at
+      work.update_time = if myshixun_endtime.present?
+                           myshixun_endtime > homework_end_or_late_time ? homework_end_or_late_time : myshixun_endtime
+                         else
+                           myshixun.updated_at > homework_end_or_late_time ? homework_end_or_late_time : myshixun.updated_at
+                         end
 
       work.final_score = final_score
       score = work.final_score + work.eff_score - work.late_penalty