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

app/controllers/graduation_tasks_controller.rb

@@ -149,6 +149,7 @@ class GraduationTasksController < ApplicationController
         else
           respond_to do |format|
             format.xlsx{
+              set_export_cookies
               graduation_work_to_xlsx(@work_excel,@task,current_user)
               task_export_name_ = "#{current_user.real_name}_#{@course.name}_#{@task.name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
               render xlsx: "#{task_export_name_.strip}",template: "graduation_tasks/tasks_list.xlsx.axlsx",locals: {table_columns:@head_cells_column, task_users:@task_cells_column}

app/controllers/graduation_works_controller.rb

@@ -379,8 +379,9 @@ class GraduationWorksController < ApplicationController
   end
 
   def adjust_score
-    tip_exception("分数不能为空") if params[:score].blank?
-    tip_exception("分数不能超过0-100") if params[:score].to_f < 0 || params[:score].to_f > 100
+    tip_exception("成绩不能为空") if params[:score].blank?
+    tip_exception("成绩不能小于零") if params[:score].to_f < 0
+    tip_exception("成绩不能大于100") if params[:score].to_f.round(1) > 100
     ActiveRecord::Base.transaction do
       begin
         # 分数不为空的历史评阅都置为失效

app/controllers/homework_commons_controller.rb

@@ -160,7 +160,7 @@ class HomeworkCommonsController < ApplicationController
 
         # 作品状态 0： 未提交， 1 按时提交， 2 延迟提交
         if params[:work_status].present?
-          params_work_status = request.get? ? params[:work_status].split(",") : params[:work_status]
+          params_work_status = 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)
@@ -171,7 +171,7 @@ class HomeworkCommonsController < ApplicationController
 
         # 分班情况
         unless params[:course_group].blank?
-          group_ids = request.get? ? params[:course_group].split(",") : params[:course_group]
+          group_ids = 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)

app/controllers/student_works_controller.rb

@@ -533,10 +533,9 @@ class StudentWorksController < ApplicationController
 
   # 作品调分
   def adjust_score
-    tip_exception("分数不能为空") if params[:score].blank?
-    tip_exception("分数不能超过0-100") if @homework.homework_type != "practice" && (params[:score].to_f < 0 || params[:score].to_f.round(1) > 100.round(1))
-    tip_exception("已提交的作品请去评阅页进行调分") if @homework.homework_type == "practice" && @work.work_status > 0
-    tip_exception("分数不能超过总分值#{@homework.total_score}") if @homework.homework_type == "practice" && (params[:score].to_f < 0 || params[:score].to_f.round(1) > @homework.total_score.round(1))
+    tip_exception("成绩不能为空") if params[:score].blank?
+    tip_exception("成绩不能小于零") if params[:score].to_f < 0
+    tip_exception("成绩不能大于100") if params[:score].to_f.round(1) > 100
     ActiveRecord::Base.transaction do
       begin
         # 分数不为空的历史评阅都置为失效