Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/homework_commons_controller.rb

@@ -448,7 +448,7 @@ class HomeworkCommonsController < 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("截止时间不能晚于课堂结束时间") if @course.end_date.present? && params[:end_time] > @course.end_date.end_of_day
 
             @homework.unified_setting = 1
             @homework.homework_group_settings.destroy_all
@@ -470,7 +470,7 @@ class HomeworkCommonsController < ApplicationController
               tip_exception("发布时间不能早于当前时间") if setting[:publish_time] <= strf_time(Time.now)
               tip_exception("截止时间不能早于当前时间") if setting[:end_time] <= strf_time(Time.now)
               tip_exception("截止时间不能早于发布时间") if setting[:publish_time] > setting[:end_time]
-              tip_exception("截止时间不能早于课堂结束时间") if @course.end_date.present? && setting[:end_time] > @course.end_date.end_of_day
+              tip_exception("截止时间不能晚于课堂结束时间") if @course.end_date.present? && setting[:end_time] > @course.end_date.end_of_day
 
 
               publish_time = setting[:publish_time] == "" ? Time.now : setting[:publish_time]
@@ -504,7 +504,7 @@ class HomeworkCommonsController < ApplicationController
           if @homework.end_time > Time.now && @homework.unified_setting
             tip_exception("截止时间不能为空") if params[:end_time].blank?
             tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
-            tip_exception("截止时间不能早于课堂结束时间") if @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
+            tip_exception("截止时间不能晚于课堂结束时间") if @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
 
             @homework.end_time = params[:end_time]