1

app/controllers/managements_controller.rb

@@ -822,7 +822,7 @@ class ManagementsController < ApplicationController
       format.xls{
         shixun_ids = @all_discusses.pluck(:dis_id).uniq
         filename = "#{Time.now.strftime("%Y%m%d")}-实训反馈.xls"
-        send_data(shixun_feedback_xls(shixun_ids), :type => "text/excel;charset=utf-8; header=present", :filename => filename_for_content_disposition(filename))
+        send_data(shixun_feedback_xls(shixun_ids, @beginTime, @endTime), :type => "text/excel;charset=utf-8; header=present", :filename => filename_for_content_disposition(filename))
       }
     end
   end
@@ -4246,7 +4246,7 @@ end
     return sheet.rows
   end
 
-  def shixun_feedback_xls shixun_ids
+  def shixun_feedback_xls shixun_ids, beginTime, endTime
     xls_report = StringIO.new
     book = Spreadsheet::Workbook.new
     sheet1 = book.create_worksheet :name => "实训反馈"
@@ -4258,6 +4258,12 @@ end
                           "评论者单位", "评论时间", "社区导师是否已回复"])
     shixuns.each_with_index do |shixun, i|
       discusses = shixun.discusses.where("user_id != ?", 1)
+      if beginTime.present?
+        discusses = discusses.where("created_at >= '#{beginTime}'")
+      end
+      if endTime.present?
+        discusses = discusses.where("created_at <= '#{endTime}'")
+      end
       sheet1[count_row, 0] = i + 1
       sheet1[count_row, 1] = shixun.identifier
       sheet1[count_row, 2] = shixun.name

app/views/managements/shixun_feedback_message.html.erb

@@ -22,6 +22,8 @@
 <script>
     function clearSearchCondition(){
         $("#shixun_Look_name").val('')
+        $("input[name='beginTime']").val('');
+        $("input[name='endTime']").val('');
     }
     $("input[name='beginTime']").datetimepicker({
         allowBlank:true,