实训作业成绩的调整

6 years ago · 1fcd4283d9
parent f5ea35748e
commit 1fcd4283d9
1 changed files with 5 additions and 1 deletions
--- 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