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

app/views/homework_commons/works_list.json.jbuilder

@@ -103,7 +103,8 @@ if @homework.homework_type == "practice"
 
     json.cost_time work.myshixun.try(:total_spend_time)
     json.current_complete_count myshixun.try(:passed_count) if @homework.end_or_late
-    json.complete_count work.myshixun&.time_passed_count(@homework.homework_group_setting(work.user_id)&.end_time)
+    end_time = @homework.allow_late ? @homework.late_time : @homework.homework_group_setting(work.user_id)&.end_time
+    json.complete_count work.myshixun&.time_passed_count(end_time)
     json.view_answer_count work.myshixun.try(:view_answer_count).to_i
     json.user_login work.user.try(:login)
     json.user_name work.user.try(:real_name)