diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 514d5c5a..5a476440 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -826,7 +826,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 @@ -4250,7 +4250,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 => "实训反馈" @@ -4262,6 +4262,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 diff --git a/app/views/managements/shixun_feedback_message.html.erb b/app/views/managements/shixun_feedback_message.html.erb index ff4ecebe..2aa7bcc8 100644 --- a/app/views/managements/shixun_feedback_message.html.erb +++ b/app/views/managements/shixun_feedback_message.html.erb @@ -1,12 +1,12 @@