Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/exercise_questions_controller.rb

@@ -616,7 +616,7 @@ class ExerciseQuestionsController < ApplicationController
     elsif params[:question_type].to_i == 2 && (params[:standard_answers].count > 1 || params[:question_choices].blank? || params[:question_choices].include?("")) #判断题的标准答案不能大于1个，选项不能为空
       normal_status(-1,"判断题选项不能为空/标准答案不能大于1个！")
     elsif params[:question_type].to_i <= 1 && (params[:question_choices].blank? || params[:question_choices].include?("") || params[:question_choices].count < 2) #选择题选项不能为空,且不能小于2
-      normal_status(-1,"选择题选项内容不能为空，且不能少于3个！")
+      normal_status(-1,"选择题选项内容不能为空，且不能少于2个！")
     elsif params[:question_type].to_i == 3 && (params[:standard_answers].blank? || params[:standard_answers].count > 5 ) #填空题选项最多为5个,且如果为1个的话，不允许修改is_ordered
       normal_status(-1,"填空题标准答案不能为空/不能超过5个！")
     elsif params[:question_type].to_i == 4 && params[:standard_answers].count > 2 #简单题参考答案最多为1个

app/controllers/files_controller.rb

@@ -17,25 +17,27 @@ class FilesController < ApplicationController
     sort_type = params[:sort_type] || 'created_on' # created_on：时间排序， downloads：下载次数排序; quotes: 引用次数排序
     course_second_category_id = params[:course_second_category_id] || 0 # 0: 为主目录， 其他为次目录id
     @user = current_user || nil
-    @attachments = @course.attachments.by_keywords(params[:search])
+    @attachments = @course.attachments.by_course_second_category_id(course_second_category_id)
                        .includes(attachment_group_settings: :course_group, author: [:user_extension, :course_members])
-                       .by_course_second_category_id(course_second_category_id)
                        .ordered(sort: sort.to_i, sort_type: sort_type.strip)
     get_category(@course, course_second_category_id)
 
-    case @user.course_identity(@course)
-    when 5
-      # 课程学生
-      @attachments = @attachments.published
-    when 6 || 7
-      # 非课堂成员
-      @attachments = @attachments.publiced.published
-    end
+    @attachments =
+      case @user.course_identity(@course)
+      when 5
+        @attachments.published
+      when 6, 7
+        @attachments.publiced.published
+      else
+        @attachments
+      end
 
     @total_count = @attachments.size
     @public_count = @attachments.publiced.size
     @private_count = @total_count - @public_count
 
+    @attachments = @attachments.by_keywords(params[:search])
+
     @attachments = @attachments.page(@page).per(@page_size)
   end
 

app/helpers/exercises_helper.rb

@@ -167,10 +167,13 @@ module ExercisesHelper
         ex_score = ex&.question_score
         full_scores = effictive_users.search_exercise_answer("score",ex_score).count  #满分人数
         no_full_scores = effictive_users.exercise_no_full_scores(ex_score).count  #部分分数人数
-        all_zero_scores = effictive_users.search_exercise_answer("score",0.0).count  #包含为0分的，及未评阅的
-        review_scores = ex.exercise_answer_comments.count  #主观题的评阅数量
-        un_review_scores = effictive_users_count - review_scores   #未评阅数
-        zero_scores = all_zero_scores - un_review_scores  #已评阅，且答案未0分的人数
+        zero_scores = effictive_users.search_exercise_answer("score",0.0).count  #包含为0分的，及未评阅的
+        # review_scores = ex.exercise_answer_comments.count  #主观题的评阅数量
+        un_review_scores = effictive_users_count - full_scores - no_full_scores - zero_scores   #未评阅数
+        if un_review_scores < 0
+          un_review_scores = 0
+        end
+        # zero_scores = all_zero_scores - un_review_scores  #已评阅，且答案未0分的人数
         main_scores_array = [full_scores,no_full_scores,zero_scores,un_review_scores]
         main_scores_array.each_with_index do |s,index|
           if index == 0
@@ -642,7 +645,11 @@ module ExercisesHelper
     end
     if student_status == 2   #当前为老师，或为学生且已提交
       user_score_pre = exercise_answers.score_reviewed
-      user_score = user_score_pre.present? ? user_score_pre.pluck(:score).sum : 0.0
+      if ques_type == 4 && user_score_pre.blank?  #主观题时，且没有大于0的分数时，为空
+        user_score = nil
+      else
+        user_score = user_score_pre.present? ? user_score_pre.pluck(:score).sum : 0.0
+      end
     end
 
     if user_score.present? && (user_score > q.question_score)