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

app/controllers/courses_controller.rb

@@ -1128,11 +1128,11 @@ class CoursesController < ApplicationController
         return normal_status(-1, "邀请码不能为空") if params[:invite_code].blank?
         invite_code = params[:invite_code]
         course = Course.find_by(invite_code: invite_code, is_delete: 0, invite_code_halt: 0, laboratory_id: current_laboratory.id)
-        course_group = CourseGroup.find_by(invite_code: invite_code)
+        course_group = CourseGroup.find_by(invite_code: invite_code, invite_code_halt: 0)
         if course.blank?
           return normal_status(-1, "邀请码无效") if course_group.blank?
 
-          course = Course.find_by(id: course_group.course_id, is_delete: 0, invite_code_halt: 0, laboratory_id: current_laboratory.id)
+          course = Course.find_by(id: course_group.course_id, is_delete: 0, laboratory_id: current_laboratory.id)
           return normal_status(-1, "邀请码无效") if course.blank?
         end
 

app/controllers/examination_banks_controller.rb

@@ -61,7 +61,7 @@ class ExaminationBanksController < ApplicationController
 
   def set_public
     tip_exception(-1, "该试卷已公开") if @exam.public?
-    tip_exception(-1, "请勿重复提交申请") if ApplyAction.where(container_id: @exam.id, container_type: "ExaminationBank").exists?
+    tip_exception(-1, "请勿重复提交申请") if ApplyAction.where(container_id: @exam.id, container_type: "ExaminationBank", status: 0).exists?
     ApplyAction.create!(container_id: @exam.id, container_type: "ExaminationBank", user_id: current_user.id)
     # @exam.update_attributes!(public: 1)
     render_ok

app/controllers/examination_intelligent_settings_controller.rb

@@ -42,11 +42,14 @@ class ExaminationIntelligentSettingsController < ApplicationController
 
     # 获取可选的题
     items = OptionalItemQuery.call(@exam.sub_discipline_id, @exam.tag_discipline_containers.pluck(:tag_discipline_id), @exam.difficulty, @exam.public)
+
+    # 可选题中去掉已组卷的试题
     type_items = items.select{ |t_item| t_item.item_type == item.item_type }
-    # 如果可选的题数小于等于设置的题数则提示无可换的题
-    tip_exception("无可换的题") if type_items.size <= exam_type_setting.count
-    # 可选题中去掉已组卷的同题型试题
-    optional_item_ids = type_items.pluck(:id) - @exam.item_baskets.where(item_type: item.item_type).pluck(:item_bank_id)
+    optional_item_ids = (type_items.pluck(:id) - @exam.item_baskets.where(item_type: item.item_type).pluck(:item_bank_id)).uniq
+
+    # 如果可选的题数等于0则提示无可换的题
+    tip_exception("无可换的题") if optional_item_ids.size == 0
+
     new_item = ItemBank.find optional_item_ids.sample(1).first
     ActiveRecord::Base.transaction do
       @exam.item_baskets << ItemBasket.new(item_bank_id: new_item.id, position: item.position, score: item.score, item_type: new_item.item_type)
@@ -62,13 +65,15 @@ class ExaminationIntelligentSettingsController < ApplicationController
     # 获取可选的题
     items = OptionalItemQuery.call(@exam.sub_discipline_id, @exam.tag_discipline_containers.pluck(:tag_discipline_id), @exam.difficulty, @exam.public)
     type_items = items.select{ |t_item| t_item.item_type == params[:item_type] }
-    # 如果可选的题数小于等于设置的题数则提示无可换的题
-    tip_exception("无可换的题") if type_items.size <= exam_type_setting.count
-    # 可选题中去掉已组卷的同题型试题
+
+    # 可选题中去掉已组卷的试题
     choosed_item_ids = choosed_items.pluck(:item_bank_id)
-    optional_item_ids = type_items.pluck(:id) - choosed_item_ids
+    optional_item_ids = (type_items.pluck(:id) - choosed_item_ids).uniq
+
+    # 如果可选的题数等于0则提示无可换的题
+    tip_exception("无可换的题") if optional_item_ids.size == 0
 
-    # 如果可选题数小于设置的题数n，则在原来的选题中随机选n个，确保换题时能选到新的题
+    # 如果可选题数小于设置的题数（n），则在原来的选题中随机选n个，确保换题时能选到新的题
     if optional_item_ids.size < exam_type_setting.count
       absence_count = exam_type_setting.count - optional_item_ids.size
       optional_item_ids = optional_item_ids + choosed_item_ids.sample(absence_count)

app/controllers/item_banks_controller.rb

@@ -54,7 +54,7 @@ class ItemBanksController < ApplicationController
 
   def set_public
     tip_exception(-1, "该试题已公开") if @item.public?
-    tip_exception(-1, "请勿重复提交申请") if ApplyAction.where(container_id: @item.id, container_type: 'ItemBank').exists?
+    tip_exception(-1, "请勿重复提交申请") if ApplyAction.where(container_id: @item.id, container_type: 'ItemBank', status: 0).exists?
     ApplyAction.create!(container_id: @item.id, container_type: 'ItemBank', user_id: current_user.id)
     # @item.update_attributes!(public: 1)
     render_ok

app/controllers/weapps/courses_controller.rb

@@ -42,11 +42,11 @@ class Weapps::CoursesController < Weapps::BaseController
     tip_exception(-1, "邀请码不能为空") if params[:invite_code].blank?
     invite_code = params[:invite_code]
     course = Course.find_by(invite_code: invite_code, is_delete: 0, invite_code_halt: 0)
-    course_group = CourseGroup.find_by(invite_code: invite_code)
+    course_group = CourseGroup.find_by(invite_code: invite_code, invite_code_halt: 0)
     if course.blank?
       tip_exception(-1, "邀请码无效") if course_group.blank?
 
-      course = Course.find_by(id: course_group.course_id, is_delete: 0, invite_code_halt: 0)
+      course = Course.find_by(id: course_group.course_id, is_delete: 0)
       tip_exception(-1, "邀请码无效") if course.blank?
     end
 

public/react/src/modules/tpm/TPMIndex.js

@@ -275,7 +275,7 @@ class TPMIndex extends Component {
             url = url.split('?')[0]
             console.log('loadingContent, url:', url)
 
-            this.setState({ loadingContent: true })
+            this.setState({ loadingContent: false })
 
             cacheInterceptorUrlMap[url] = true
           }
@@ -327,7 +327,7 @@ class TPMIndex extends Component {
     }
 
     setLoadingContent = (isLoadingContent) => {
-        this.setState({ loadingContent: isLoadingContent })
+        // this.setState({ loadingContent: isLoadingContent })
     }