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

app/models/course.rb

@@ -392,7 +392,7 @@ class Course < ApplicationRecord
   # 课堂实训作业的评测次数
   def evaluate_count
     course_user_ids = students.pluck(:user_id)
-    shixun_ids = homework_commons.joins(:homework_commons_shixun).where(homework_type: 4).pluck(:shixun_id)
+    shixun_ids = homework_commons.joins(:homework_commons_shixun).where(homework_type: "practice").pluck(:shixun_id)
     return 0 if shixun_ids.blank?
     Game.joins(:challenge).where(challenges: {shixun_id: shixun_ids}, games: {user_id: course_user_ids}).sum(:evaluate_count)
   end

app/views/admins/courses/shared/_td.html.erb

@@ -5,9 +5,9 @@
 </td>
 <td><%= course.course_members_count %></td>
 <td><%= get_attachment_count(course, 0) %></td>
-<td><%= course.course_homework_count(1) %></td>
-<td><%= course.course_homework_count(3) %></td>
-<td><%= course.course_homework_count(4) %></td>
+<td><%= course.course_homework_count("normal") %></td>
+<td><%= course.course_homework_count("group") %></td>
+<td><%= course.course_homework_count("practice") %></td>
 <td><%= course.exercises_count %></td>
 <td><%= course.evaluate_count %></td>
 <td><%= course.is_public == 1 ? "--" : "√" %></td>