Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/courses_controller.rb

@@ -35,7 +35,7 @@ class CoursesController < ApplicationController
                                          :transfer_to_course_group, :delete_from_course, :export_member_scores_excel,
                                          :search_users, :add_students_by_search, :get_historical_courses, :add_teacher_popup,
                                          :add_teacher, :export_couser_info, :export_member_act_score,
-                                         :update_informs, :new_informs, :delete_informs]
+                                         :update_informs, :new_informs, :delete_informs, :switch_to_student]
   before_action :admin_allowed, only: [:set_invite_code_halt, :set_public_or_private, :change_course_admin,
                                        :set_course_group, :create_group_by_importing_file,
                                        :update_task_position, :tasks_list]
@@ -681,13 +681,19 @@ class CoursesController < ApplicationController
         course_member = @course.course_members.find_by!(user_id: current_user.id, is_active: 1)
         tip_exception("切换失败") if course_member.STUDENT?
 
-        course_student = CourseMember.find_by!(user_id: current_user.id, role: %i[STUDENT], course_id: @course.id)
-        course_member.update_attributes(is_active: 0)
-        course_student.update_attributes(is_active: 1)
+        course_student = CourseMember.find_by(user_id: current_user.id, role: %i[STUDENT], course_id: @course.id)
+        if course_student
+          course_student.update_attributes!(is_active: 1)
+        else
+          # 学生身份不存在则创建
+          CourseMember.create!(user_id: current_user.id, role: %i[STUDENT], course_id: @course.id)
+          CourseAddStudentCreateWorksJob.perform_later(@course.id, [current_user.id])
+        end
+        course_member.update_attributes!(is_active: 0)
         normal_status(0, "切换成功")
       rescue => e
         uid_logger_error("switch_to_student error: #{e.message}")
-        tip_exception("切换失败")
+        tip_exception(e.message)
         raise ActiveRecord::Rollback
       end
     end
@@ -1127,7 +1133,7 @@ class CoursesController < ApplicationController
 
   def top_banner
     @user = current_user
-    @is_teacher = @user_course_identity < Course::STUDENT
+    @switch_student = Course::BUSINESS < @user_course_identity < Course::STUDENT
     @is_student = @user_course_identity == Course::STUDENT
     @course.increment!(:visits)
   end

app/controllers/homework_commons_controller.rb

@@ -160,7 +160,8 @@ class HomeworkCommonsController < ApplicationController
 
         # 作品状态 0： 未提交， 1 按时提交， 2 延迟提交
         if params[:work_status].present?
-          work_status = params[:work_status].map{|status| status.to_i}
+          params_work_status = request.get? ? params[:work_status].split(",") : params[:work_status]
+          work_status = params_work_status.map{|status| status.to_i}
           all_student_works = @student_works.left_joins(:myshixun)
           @student_works = all_student_works.where(work_status: work_status)
 
@@ -170,7 +171,8 @@ class HomeworkCommonsController < ApplicationController
 
         # 分班情况
         unless params[:course_group].blank?
-          group_user_ids = @course.students.where(course_group_id: params[:course_group]).pluck(:user_id)
+          group_ids = request.get? ? params[:course_group].split(",") : params[:course_group]
+          group_user_ids = @course.students.where(course_group_id: group_ids).pluck(:user_id)
           # 有分组只可能是老师身份查看列表
           @student_works = @student_works.where(user_id: group_user_ids)
         end
@@ -482,7 +484,7 @@ class HomeworkCommonsController < ApplicationController
 
               publish_time = setting[:publish_time] == "" ? Time.now : setting[:publish_time]
               # 截止时间为空时取发布时间后一个月
-              end_time = setting[:end_time] == "" ? Time.at(publish_time.to_time.to_i+30*24*3600) : setting[:end_time]
+              end_time = setting[:end_time]
               HomeworkGroupSetting.where(homework_common_id: @homework.id, course_group_id: setting[:group_id]).
                   update_all(publish_time: publish_time, end_time: end_time)
               setting_group_ids << setting[:group_id]
@@ -1170,7 +1172,7 @@ class HomeworkCommonsController < ApplicationController
       # 可立即截止的分班：统一设置则是用户管理的所有分班，否则是当前用户管理的分班中已发布且未截止的
       charge_group_ids = @course.charge_group_ids(@current_user)  # 当前用户管理的分班
       group_ids = @homework.unified_setting ? charge_group_ids :
-                      @homework.homework_group_settings.where(course_group_id: charge_group_ids).none_end.pluck(:course_group_id)
+                      @homework.homework_group_settings.where(course_group_id: charge_group_ids).published_no_end.pluck(:course_group_id)
       @course_groups = @course.course_groups.where(id: group_ids)
     else
       tip_exception("没有可截止的分班")

app/helpers/export_helper.rb

@@ -452,7 +452,7 @@ module ExportHelper
       end
     end
 
-    out_file_name = "作品附件_#{homework_common&.course&.name}_#{homework_common.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}.zip"
+    out_file_name = "作品附件_#{homework_common.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}.zip"
     out_file_name.gsub!(" ", "-")
     out_file_name.gsub!("/", "_")
     out_file = find_or_pack(homework_common, homework_common.user_id, digests.sort){

app/models/homework_group_setting.rb

@@ -6,6 +6,6 @@ class HomeworkGroupSetting < ApplicationRecord
   scope :none_published, -> {where("homework_group_settings.publish_time IS NULL OR homework_group_settings.publish_time > ?", Time.now)}
   scope :published_no_end, -> {where("homework_group_settings.publish_time IS NOT NULL AND homework_group_settings.publish_time < ?
                                       and homework_group_settings.end_time > ?", Time.now, Time.now)}
-  scope :none_end, -> {where("homework_group_settings.end_time IS NOT NULL AND homework_group_settings.end_time > ?", Time.now)}
+  scope :none_end, -> {where("homework_group_settings.end_time IS NULL or homework_group_settings.end_time > ?", Time.now)}
 
 end

app/views/courses/top_banner.json.jbuilder

@@ -15,7 +15,7 @@ json.is_admin @user_course_identity < Course::PROFESSOR
 json.is_public @course.is_public == 1
 json.code_halt @course.invite_code_halt == 1
 json.invite_code @course.invite_code_halt == 0 ? @course.generate_invite_code : ""
-json.switch_to_student switch_student_role(@is_teacher, @course, @user)
+json.switch_to_student @switch_student
 json.switch_to_teacher switch_teacher_role(@is_student, @course, @user)
 json.switch_to_assistant switch_assistant_role(@is_student, @course, @user)
 #json.join_course !@user.member_of_course?(@course)

public/react/src/modules/courses/members/CourseGroupListTable.js

@@ -198,7 +198,7 @@ function CourseGroupListTable(props) {
     const dataSource = course_groups.map(item => {
         return {
             ...item,
-            subStringOfMember_manager : item.member_manager.length > 92 
+            subStringOfMember_manager : (item.member_manager && item.member_manager.length > 92)
                 ? item.member_manager.substring(0, 92) + '...' : null
         }
     })