调整

app/controllers/courses_controller.rb

@@ -1062,14 +1062,22 @@ class CoursesController < ApplicationController
           AND student_works.user_id = cm.user_id
         ) AS score,
         (SELECT max(student_id) FROM user_extensions WHERE user_extensions.user_id = cm.user_id) AS student_id,
-        (SELECT count(messages.id) FROM messages join boards on messages.board_id = boards.id WHERE boards.course_id = #{@course.id} AND messages.author_id = cm.user_id and messages.parent_id is null) AS message_num,
+        (SELECT count(messages.id) FROM messages join boards on messages.board_id = boards.id WHERE boards.course_id = #{@course.id}
-        (SELECT count(messages.id) FROM messages join boards on messages.board_id = boards.id WHERE boards.course_id = #{@course.id} AND messages.author_id = cm.user_id and messages.parent_id is not null) AS message_reply_num,
+                AND messages.author_id = cm.user_id and messages.parent_id is null) AS message_num,
-        (SELECT count(attachments.id) FROM attachments WHERE container_id = #{@course.id} and container_type = "Course" AND attachments.author_id = cm.user_id) AS resource_num,
+        (SELECT count(messages.id) FROM messages join boards on messages.board_id = boards.id WHERE boards.course_id = #{@course.id}
-        (SELECT count(jfm.id) FROM journals_for_messages AS jfm, homework_commons hs WHERE jfm.jour_id = hs.id AND jfm.user_id = cm.user_id and jfm.jour_type = "HomeworkCommon" and hs.course_id = #{@course.id}) AS homework_journal_num,
+                AND messages.author_id = cm.user_id and messages.parent_id is not null) AS message_reply_num,
-        (SELECT COUNT(gw.id) FROM graduation_works AS gw, graduation_tasks AS gt WHERE gw.graduation_task_id = gt.id AND gt.course_id = #{@course.id} AND gw.work_status != 0 AND gw.user_id = cm.user_id) AS graduation_num,
+        (SELECT count(attachments.id) FROM attachments WHERE container_id = #{@course.id} and container_type = "Course"
-        (SELECT COUNT(ss.id) FROM student_works AS ss ,homework_commons AS hc WHERE ss.homework_common_id = hc.id AND hc.course_id = #{@course.id} AND ss.work_status != 0 AND ss.user_id = cm.user_id) AS homework_num,
+                AND attachments.author_id = cm.user_id) AS resource_num,
-        (SELECT COUNT(eu.id) FROM exercise_users AS eu,exercises WHERE eu.exercise_id = exercises.id AND exercises.course_id = #{@course.id} AND eu.commit_status = 1 AND eu.user_id = cm.user_id) AS exercise_num,
+        (SELECT count(jfm.id) FROM journals_for_messages AS jfm, homework_commons hs WHERE jfm.jour_id = hs.id AND
-        (SELECT COUNT(pu.id) FROM poll_users AS pu, polls WHERE pu.poll_id = polls.id AND polls.course_id = #{@course.id} AND pu.commit_status = 1 AND pu.user_id = cm.user_id) AS poll_num
+                jfm.user_id = cm.user_id and jfm.jour_type = "HomeworkCommon" and hs.course_id = #{@course.id}) AS homework_journal_num,
+        (SELECT COUNT(gw.id) FROM graduation_works AS gw, graduation_tasks AS gt WHERE gw.graduation_task_id = gt.id AND
+                gt.course_id = #{@course.id} AND gw.work_status != 0 AND gw.user_id = cm.user_id) AS graduation_num,
+        (SELECT COUNT(ss.id) FROM student_works AS ss ,homework_commons AS hc WHERE ss.homework_common_id = hc.id AND
+                hc.course_id = #{@course.id} AND ss.work_status != 0 AND ss.user_id = cm.user_id) AS homework_num,
+        (SELECT COUNT(eu.id) FROM exercise_users AS eu,exercises WHERE eu.exercise_id = exercises.id AND exercises.course_id = #{@course.id}
+                AND eu.commit_status = 1 AND eu.user_id = cm.user_id) AS exercise_num,
+        (SELECT COUNT(pu.id) FROM poll_users AS pu, polls WHERE pu.poll_id = polls.id AND polls.course_id = #{@course.id}
+                AND pu.commit_status = 1 AND pu.user_id = cm.user_id) AS poll_num
         FROM course_members cm}
     if search.present? && group_id.present?
       sql_select += %Q{ join users on cm.user_id = users.id
@@ -1078,7 +1086,7 @@ class CoursesController < ApplicationController
                       (concat(users.lastname, users.firstname) like '%#{search}%' or ue.student_id like '%#{search}%') ORDER BY score desc}
 
     elsif search.present?
-      ql_select += %Q{ join users on cm.user_id = users.id
+      sql_select += %Q{ join users on cm.user_id = users.id
                       joins user_extensions ue on ue.user_id = users.id
                       WHERE cm.role = 4 and
                       (concat(users.lastname, users.firstname) like '%#{search}%' or ue.student_id like '%#{search}%') ORDER BY score desc}
@@ -1101,7 +1109,7 @@ class CoursesController < ApplicationController
     common_titles = common_homeworks.pluck(:name)+ ["总得分"]
     common_homeworks = common_homeworks.includes(:score_student_works)
 
-    group_homeworks = homeworks.search_homework_type(3).includes(:score_student_works)  #全部分组作业
+    group_homeworks = homeworks.search_homework_type(3)  #全部分组作业
     group_titles = group_homeworks.pluck(:name)+ ["总得分"]
     group_homeworks = group_homeworks.includes(:score_student_works)
 
@@ -1179,7 +1187,7 @@ class CoursesController < ApplicationController
       c_poll_num = user_poll_num*7
       c_file_num = user_file_num*5
       c_message_num = user_messages_num*2
-      c_reply_num = user_reply_num*2
+      c_reply_num = user_reply_num
       user_activity_levels = c_works_num + c_exercise_num + c_poll_num + c_file_num + c_message_num + c_reply_num + user_work_reply_num
       user_ac_level = {
           u_1: user_name,