From e1bea29dcbf25bfc2ec643fe454ba50596c25de0 Mon Sep 17 00:00:00 2001 From: SylorHuang Date: Fri, 11 Oct 2019 15:15:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AF=95=E5=8D=B7?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8F=90=E4=BA=A4=E7=9A=84=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercises_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb index bc0da8ffc..ed09b8784 100644 --- a/app/controllers/exercises_controller.rb +++ b/app/controllers/exercises_controller.rb @@ -1102,10 +1102,10 @@ class ExercisesController < ApplicationController ActiveRecord::Base.transaction do begin can_commit_exercise = false - Rails.logger.info("######____________params[:commit_method]_________################{params[:commit_method]}") - if (@user_course_identity > Course::ASSISTANT_PROFESSOR) && params[:commit_method].present? #为学生时 + if @user_course_identity > Course::ASSISTANT_PROFESSOR #为学生时 if params[:commit_method].to_i == 2 #自动提交时 user_left_time = get_exercise_left_time(@exercise,current_user) + Rails.logger.info("######__________auto_commit_user_left_time_________################{user_left_time}") if user_left_time.to_i <= 0 can_commit_exercise = true end @@ -1130,10 +1130,10 @@ class ExercisesController < ApplicationController CommitExercsieNotifyJobJob.perform_later(@exercise.id, current_user.id) normal_status(0,"试卷提交成功！") else - normal_status(-1,"提交失败，请重试!") + normal_status(-1,"提交失败，未到截止时间!") end else - normal_status(-1,"提交失败，请重试!") + normal_status(-1,"提交失败，当前用户不为课堂学生!") end rescue Exception => e uid_logger_error(e.message) From b8cc352c525604904c6749710c4f4b11aa80ce70 Mon Sep 17 00:00:00 2001 From: SylorHuang Date: Fri, 11 Oct 2019 15:20:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=9B=9E=E9=87=8D=E5=81=9A?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9commit=5Fmethod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercises_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb index ed09b8784..f9d9531f1 100644 --- a/app/controllers/exercises_controller.rb +++ b/app/controllers/exercises_controller.rb @@ -978,7 +978,8 @@ class ExercisesController < ApplicationController :status => nil, :commit_status => 0, :objective_score => 0.0, - :subjective_score => -1.0 + :subjective_score => -1.0, + :commit_method => 0 } redo_exercise_users = @exercise_users.exercise_commit_users(user_ids) redo_exercise_users.update_all(redo_option)