From d21085c92098a502bb8a3692badccf3dad6f34dc Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Sat, 24 Aug 2019 15:54:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E6=88=AA=E6=AD=A2=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/graduation_tasks_controller.rb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/controllers/graduation_tasks_controller.rb b/app/controllers/graduation_tasks_controller.rb
index 4cae4e08b..727bdb77e 100644
--- a/app/controllers/graduation_tasks_controller.rb
+++ b/app/controllers/graduation_tasks_controller.rb
@@ -322,6 +322,8 @@ class GraduationTasksController < ApplicationController
   def publish_task
     tip_exception("缺少截止时间参数") if params[:end_time].blank?
     tip_exception("截止时间必须晚于当前时间") if params[:end_time] <= strf_time(Time.now)
+    tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
+      @course.end_date.present? && params[:end_time] > @course.end_date.end_of_day
 
     ActiveRecord::Base.transaction do
       begin
@@ -397,8 +399,8 @@ class GraduationTasksController < ApplicationController
             tip_exception("发布时间不能早于当前时间") if params[:publish_time] <= Time.now.strftime("%Y-%m-%d %H:%M:%S")
             tip_exception("截止时间不能早于当前时间") if params[:end_time] <= Time.now.strftime("%Y-%m-%d %H:%M:%S")
             tip_exception("截止时间不能早于发布时间") if params[:publish_time] > params[:end_time]
-            tip_exception("截止时间不能早于课堂结束时间") if @course.end_date.present? &&
-                params[:end_time] > @course.end_date.end_of_day
+            tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
+              @course.end_date.present? && params[:end_time] > @course.end_date.end_of_day
 
             @task.publish_time = params[:publish_time]
             @task.end_time = params[:end_time]
@@ -410,7 +412,8 @@ class GraduationTasksController < ApplicationController
           elsif @task.status < 2
             tip_exception("截止时间不能为空") if params[:end_time].blank?
             tip_exception("截止时间不能早于当前时间") if params[:end_time] <= Time.now.strftime("%Y-%m-%d %H:%M:%S")
-            tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if @course.end_date.present? && params[:end_time] > @course.end_date.end_of_day
+            tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
+              @course.end_date.present? && params[:end_time] > @course.end_date.end_of_day
             @task.end_time = params[:end_time]
           end
 
@@ -421,8 +424,8 @@ class GraduationTasksController < ApplicationController
           if params[:allow_late].to_i == 1
             tip_exception("补交结束时间不能为空") if params[:late_time].blank?
             tip_exception("补交结束时间不能早于截止时间") if params[:late_time] <= @task.end_time
-            tip_exception("补交结束时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if @course.end_date.present? && params[:late_time] >
-                                                                      @course.end_date.end_of_day
+            tip_exception("补交结束时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
+              @course.end_date.present? && params[:late_time] > @course.end_date.end_of_day
             tip_exception("迟交扣分应为正整数") if params[:late_penalty] && params[:late_penalty].to_i < 0
 
             @task.allow_late = true