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

app/controllers/homework_commons_controller.rb

@@ -78,7 +78,7 @@ class HomeworkCommonsController < ApplicationController
         when '4'
           sql_str = %Q((homework_detail_manuals.comment_status = #{order} and homework_detail_manuals.appeal_time > '#{Time.now}'))
         when '5'
-          sql_str = %Q((homework_detail_manuals.comment_status = #{order} or (anonymous_comment = 0 and ((allow_late= 0 and homework_commons.end_time <= '#{Time.now}') or (allow_late= 1 and late_time <= '#{Time.now}')))))
+          sql_str = %Q((anonymous_comment = 0 or (anonymous_comment = 1 and homework_detail_manuals.comment_status = #{order})) and ((allow_late= 0 and homework_commons.end_time <= '#{Time.now}') or (allow_late= 1 and late_time <= '#{Time.now}')))
         else
           sql_str = %Q(homework_detail_manuals.comment_status = #{order})
         end
@@ -194,7 +194,6 @@ class HomeworkCommonsController < ApplicationController
         end
 
         @work_count = @student_works.size
-        @work_excel = @student_works.where("work_status > 0")
 
         # 排序
         rorder = params[:order].blank? ? "update_time" : params[:order]
@@ -204,6 +203,7 @@ class HomeworkCommonsController < ApplicationController
         elsif rorder == "student_id"
           @student_works = @student_works.joins(user: :user_extension).order("user_extensions.#{rorder} #{b_order}")
         end
+        @work_excel = @student_works
 
         # 分页参数
         page = params[:page] || 1

app/helpers/export_helper.rb

@@ -466,7 +466,7 @@ module ExportHelper
         else
           w_6 = "--"
         end
-        w_7 = w.work_status == 0 ? '--' : myshixun&.time_passed_count(homework.homework_group_setting(w.user_id)&.end_time).to_i.to_s+"/"+shixun.challenges_count.to_s
+        w_7 = myshixun&.time_passed_count(homework.homework_group_setting(w.user_id)&.end_time).to_i.to_s+"/"+shixun.challenges_count.to_s
         w_8 = myshixun ? myshixun.try(:passed_time).to_s == "--" ? "--" : format_time(myshixun.try(:passed_time)) : "--"  # 通关时间
         w_9 = myshixun ? (myshixun.try(:passed_count).to_i > 0 ? myshixun.total_spend_time : '--') : "--"  #总耗时
         w_10 = myshixun ? myshixun.output_times : 0  #评测次数