Merge branches 'dev_aliyun' and 'dev_cxt' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cxt

app/helpers/export_helper.rb

@@ -455,12 +455,14 @@ module ExportHelper
         course_name = course.students.find_by(user_id: w.user_id).try(:course_group_name)
         w_5 = course_name.present? ? course_name : "--"
         #0： 未提交， 1 按时提交， 2 延迟提交
-        if w.work_status == 0
-          w_6 = "未提交"
-        elsif w.work_status == 1
-          w_6 = "按时提交"
-        elsif w.work_status == 2
-          w_6 = "延迟提交"
+        if w.compelete_status == 0
+          w_6 = "未开启"
+        elsif w.compelete_status == 1
+          w_6 = "未通关"
+        elsif w.compelete_status == 2
+          w_6 = "按时通关"
+        elsif w.compelete_status == 3
+          w_6 = "迟交通关"
         else
           w_6 = "--"
         end

app/helpers/homework_commons_helper.rb

@@ -28,6 +28,13 @@ module HomeworkCommonsHelper
       if ho_detail_manual
         # 作业状态大于“提交”状态时，不用考虑分班权限
         if ho_detail_manual.comment_status > 1
+          if homework_common.end_time && homework_common.end_time < Time.now && homework_common.allow_late &&
+            (homework_common.late_time.nil? || homework_common.late_time > Time.now)
+            status << "补交中"
+            time = "补交剩余时间：" + how_much_time(homework_common.late_time)
+            time_status = 2
+          end
+
           case ho_detail_manual.comment_status
           when 3
             if ho_detail_manual.evaluation_end && ho_detail_manual.evaluation_end > Time.now
@@ -42,12 +49,7 @@ module HomeworkCommonsHelper
               time_status = 4
             end
           else
-            if homework_common.end_time && homework_common.end_time < Time.now && homework_common.allow_late &&
-              (homework_common.late_time.nil? || homework_common.late_time > Time.now)
-              status << "补交中"
-              time = "补交剩余时间：" + how_much_time(homework_common.late_time)
-              time_status = 2
-            else
+            if status.blank?
               status << "已截止"
               time = course.end_date.present? ? ("评阅剩余时间：" + how_much_time(course.end_date.end_of_day)) : ""
               time_status = 5