From 4fe175e2dc131db006d5feccd99325c55a891485 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 14 Nov 2019 10:31:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E8=AE=BE=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercises_controller.rb | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index 2c7665b8f..682d71a2d 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -458,15 +458,16 @@ class ExercisesController < ApplicationController
 
         # 统一设置或者分班为0，则更新试卷，并删除试卷分组
         if unified_setting || (course_group_ids.size == 0)
-          params_publish_time = params[:publish_time].blank? ? nil : params[:publish_time].to_time
-          params_end_time = nil
-          if params[:end_time].blank?
-            if params_publish_time.present?
-              params_end_time = params_publish_time + 30.days
-            end
-          else
-            params_end_time = params[:end_time].to_time
-          end
+          tip_exception("发布时间不能为空") if params[:publish_time].blank?
+          tip_exception("截止时间不能为空") if params[:end_time].blank?
+          tip_exception("发布时间不能早于当前时间") if params[:publish_time].to_time <= Time.now
+          tip_exception("截止时间不能早于当前时间") if params[:end_time].to_time <= Time.now
+          tip_exception("截止时间不能早于发布时间") if params[:publish_time].to_time > params[:end_time].to_time
+          tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
+            @course.end_date.present? && params[:end_time].to_time > @course.end_date.end_of_day
+
+          params_publish_time = params[:publish_time].to_time
+          params_end_time = params[:end_time].to_time
 
           if (exercise_status != Exercise::UNPUBLISHED) && (@exercise.publish_time != params_publish_time)
             normal_status(-1,"已发布/已截止,不允许修改发布时间")