fixbug

app/controllers/courses_controller.rb

@@ -1373,7 +1373,6 @@ class CoursesController < ApplicationController
     count_2 = common_homeworks.size
     count_3 = group_homeworks.size
     count_4 = tasks.size
-    count_5 = exercises.size
     #实训作业
     shixun_homeworks.each_with_index do |s,index|
       all_student_works = s.score_student_works   #该实训题的全部用户回答

app/controllers/exercises_controller.rb

@@ -511,7 +511,6 @@ class ExercisesController < ApplicationController
             else
               exercise_end_time = t[:end_time].to_time
             end
-            # exercise_end_time = t[:end_time].present? ? t[:end_time].to_time : nil
             exercise_group = exercise_groups.find_in_exercise_group("course_group_id",course_id)  #判断该分班是否存在
             if exercise_group.present? && (exercise_group.first.publish_time < Time.now) && (exercise_publish_time != exercise_group.first.publish_time)
               error_count += 1

app/models/exercise.rb

@@ -74,15 +74,15 @@ class Exercise < ApplicationRecord
 
   # 根据是否统一发布获取作业的作品列表
   def all_works
-    ex_users = unified_setting ? exercise_users :
+    ex_users = self.unified_setting ? exercise_users :
                         exercise_users.joins("join course_members on exercise_users.user_id=course_members.user_id").
                             where(course_members: {course_group_id: published_settings.pluck(:course_group_id)})
   end
 
   # 分班权限的老师可见的作品列表
-  def all_exercise_users user_id
+  def all_exercise_users(user_id)
     # member = course.course_member(user_id)
-    teacher_course_groups = course.teacher_course_groups.get_user_groups(user_id)
+    teacher_course_groups = course.teacher_course_groups.where(user_id:user_id)
     ex_users = self.all_works
     # 有分班权限的统计管理的分班且已发布的学生情况
     if teacher_course_groups.exists?
@@ -154,11 +154,11 @@ class Exercise < ApplicationRecord
         update_column("exercise_status",3)
       end
     else
-      ex_group_setting = exercise_group_settings
+      # ex_group_setting = exercise_group_settings
       user_group = course.students.where(user_id:user_id).select(:course_group_id)
       if user_group.exists?
         user_group_id = user_group.first&.course_group_id
-        user_ex_group_setting = ex_group_setting.where(course_group_id:user_group_id).select(:publish_time,:end_time)
+        user_ex_group_setting = exercise_group_settings.where(course_group_id:user_group_id).select(:publish_time,:end_time)
         pb_time = user_ex_group_setting.first&.publish_time
         en_time = user_ex_group_setting.first&.end_time
       else