实训作业的列表增加过滤

app/controllers/homework_commons_controller.rb

@@ -159,8 +159,12 @@ class HomeworkCommonsController < ApplicationController
         end
 
         # 作品状态 0： 未提交， 1 按时提交， 2 延迟提交
-        unless params[:work_status].blank?
-          @student_works = @student_works.where(work_status: params[:work_status])
+        if params[:work_status].present?
+          work_status = params[:work_status].map{|status| status.to_i}
+          all_student_works = @student_works
+          @student_works = all_student_works.where(work_status: work_status)
+          @student_works = @student_works.or(all_student_works.where(work_status: 0)).or(all_student_works.joins(:myshixun).where(status: 0)) if work_status.include?(3)
+          @student_works = @student_works.or(all_student_works.joins(:myshixun).where(status: 1)) if work_status.include?(4)
         end
 
         # 分班情况

app/helpers/homework_commons_helper.rb

@@ -224,8 +224,8 @@ module HomeworkCommonsHelper
 
   # 作品状态
   def homework_status homework, member
-    [{id: 3, name: "未通关", count: homework.finished_count(member)},
-     {id: 4, name: "已通关", count: homework.delay_finished_count(member)},
+    [{id: 3, name: "未通关", count: homework.un_complete_count(member)},
+     {id: 4, name: "已通关", count: homework.complete_count(member)},
      {id: 1, name: "按时提交", count: homework.finished_count(member)},
      {id: 2, name: "延时提交", count: homework.delay_finished_count(member)}]
   end

app/models/homework_common.rb

@@ -242,12 +242,12 @@ class HomeworkCommon < ApplicationRecord
 
   # 未通关数
   def un_complete_count member
-    self.teacher_works(member).finished.count
+    teacher_works(member).count - complete_count(member)
   end
 
   # 通关数
   def complete_count member
-
+    Myshixun.where(id: self.teacher_works(member).pluck(:myshixun_id), status: 1).count
   end
 
   # 分组作业的最大分组id