From eb790bdf990a5680966bcdcdc2fdf023d9aa244e Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 14 Feb 2020 21:51:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E4=BD=9C=E4=B8=9A=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/homework_commons_helper.rb         | 4 ++--
 app/views/homework_commons/index.json.jbuilder | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/helpers/homework_commons_helper.rb b/app/helpers/homework_commons_helper.rb
index f962288eb..3061a6e80 100644
--- a/app/helpers/homework_commons_helper.rb
+++ b/app/helpers/homework_commons_helper.rb
@@ -171,10 +171,10 @@ module HomeworkCommonsHelper
     {status: status, time: time}
   end
 
-  # 作品数统计：type： 1 已提交  0 未提交
+  # 作品数统计：type： 1 已提交  0 未提交  2 所有
   def studentwork_count homework_common, type, member
     student_works = homework_common.teacher_works(member)
-    type == 1 ? student_works.where("work_status != 0").size : student_works.where(work_status: 0).size
+    type == 2 ? student_works.size : (type == 1 ? student_works.where("work_status != 0").size : student_works.where(work_status: 0).size)
   end
 
   # 上次查重的时间
diff --git a/app/views/homework_commons/index.json.jbuilder b/app/views/homework_commons/index.json.jbuilder
index 00c50e519..6b34eb220 100644
--- a/app/views/homework_commons/index.json.jbuilder
+++ b/app/views/homework_commons/index.json.jbuilder
@@ -27,6 +27,7 @@ json.homeworks @homework_commons.each do |homework|
   unless curr_status[:status].include?("未发布")
     json.commit_count studentwork_count homework, 1, @member
     json.uncommit_count studentwork_count homework, 0, @member
+    json.all_count studentwork_count homework, 2, @member
   end
 
   if homework.homework_type == "practice"