对已发布的作业截止时间进行调整时,如果作业截止时间大于等于匿评开始时间且匿评还未开启则匿评开始时间和结束时间都相应往后推迟7天

app/controllers/homework_common_controller.rb

@@ -73,9 +73,11 @@ class HomeworkCommonController < ApplicationController
       if @homework.publish_time <= Date.today && homework_detail_manual.comment_status == 0
         homework_detail_manual.comment_status = 1
       end
-      homework_detail_manual.evaluation_start = params[:evaluation_start].blank? ? @homework.end_time + 7 : params[:evaluation_start]
-      homework_detail_manual.evaluation_end = params[:evaluation_end].blank? ? homework_detail_manual.evaluation_start + 7 : params[:evaluation_end]
-
+      eval_start = homework_detail_manual.evaluation_start
+      if eval_start <= @homework.end_time && homework_detail_manual.comment_status <= 1
+        homework_detail_manual.evaluation_start = @homework.end_time + 7
+        homework_detail_manual.evaluation_end = homework_detail_manual.evaluation_start + 7
+      end
       @homework.save_attachments(params[:attachments])
       render_attachment_warning_if_needed(@homework)
 

app/views/users/_user_homework_form.html.erb

@@ -159,7 +159,7 @@
     <% end %>
     <div class="calendar_div fl mr10">
       <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time%>"  >
-      <% if homework.homework_detail_manual.comment_status.to_i < 3 %>
+      <% if homework.homework_detail_manual.comment_status.to_i < 2 %>
         <%= calendar_for('homework_end_time')%>
       <% end %>
     </div>