diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index 3c3a92e5..daecbe75 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -792,12 +792,22 @@ class ManagementsController < ApplicationController
     @menu_type = 8
     @sub_type = 2
     @search = params[:search]
+    @beginTime = params[:beginTime]
+    @endTime = params[:endTime]
     if @search.present?
       shixun_ids = Shixun.where("name like ?", "%#{params[:search]}%").pluck(:id)
       @discusses = Discuss.where(:dis_type => "Shixun", :dis_id => shixun_ids).reorder("created_at desc")
     else
       @discusses = Discuss.where(:dis_type => "Shixun").reorder("created_at desc")
     end
+
+    if params[:beginTime] && params[:beginTime].strip != ""
+      @discusses = @discusses.where("created_at >= '#{Time.parse(params[:beginTime])}'")
+    end
+    if params[:endTime] && params[:endTime].strip != ""
+      @discusses = @discusses.where("created_at <= '#{Time.parse(params[:endTime])}'")
+    end
+
     @all_discusses = @discusses
     @discusses_count =  @discusses.count
     @limit = 20
@@ -4241,7 +4251,8 @@ end
       sheet1[count_row, 5] = discusses.count
       discusses.each_with_index do |discuss, j|
         user = discuss.user
-        sheet1[count_row, 6] = discuss.content.gsub(/<img.*\/>/, "【图片评论】").gsub(/!\[\].+\)/, "【图片评论】")
+        content = discuss.content.gsub(/<img.*\/>/, "【图片评论】").gsub(/!\[\].+\)/, "【图片评论】")
+        sheet1[count_row, 6] = strip_html content
         sheet1[count_row, 7] = "第#{discuss.position}关"
         sheet1[count_row, 8] = user.show_real_name
         sheet1[count_row, 9] = user.identity
diff --git a/app/views/managements/shixun_feedback_message.html.erb b/app/views/managements/shixun_feedback_message.html.erb
index c987f283..ff4ecebe 100644
--- a/app/views/managements/shixun_feedback_message.html.erb
+++ b/app/views/managements/shixun_feedback_message.html.erb
@@ -2,11 +2,17 @@
   <%= form_tag(url_for(shixun_feedback_message_managements_path), :id => "managements_shixuns_search", :method => "post", :remote => true ) do %>
     <div class="edu-con-top clearfix mb20">
       <input class="fl task-form-20 task-height-30 ml25" id="shixun_Look_name" name="search" maxlength="" placeholder="输入实训名称关键字进行搜索" type="text" style="height: 21px;">
+
+      <li class="fl">
+        <span class="mr10 ml10 font-14">发布时间</span>
+        <input type="text" name="beginTime" readonly placeholder="请选择开始时间" class="winput-150-30 mr10"/>
+        <input type="text" name="endTime" readonly placeholder="请选择结束时间" class="winput-150-30"/>
+      </li>
       <li class="fl ml10">
         <a href="javascript:void(0)" class="task-btn task-btn-orange" onclick="$('#managements_shixuns_search').submit();">搜索</a>
         <a href="javascript:clearSearchCondition();" class="task-btn mr10">清除</a>
       </li>
-      <a href="<%= shixun_feedback_message_managements_path(:search => @search, :format => "xls") %>" id="shixun_search" class="task-btn mr10 task-btn-orange fr">导出</a>
+      <a href="<%= shixun_feedback_message_managements_path(:search => @search, :beginTime => @beginTime, :endTime => @endTime,:format => "xls") %>" id="shixun_search" class="task-btn mr10 task-btn-orange fr">导出</a>
     </div>
   <% end %>
   <div class="ex_container" id="management_shixun_feedback_list">
@@ -17,4 +23,16 @@
     function clearSearchCondition(){
         $("#shixun_Look_name").val('')
     }
+    $("input[name='beginTime']").datetimepicker({
+        allowBlank:true,
+        lang:'ch',
+        format:'Y-m-d H:i',
+        validateOnBlur:false
+    });
+    $("input[name='endTime']").datetimepicker({
+        allowBlank:true,
+        lang:'ch',
+        format:'Y-m-d H:i',
+        validateOnBlur:false
+    });
 </script>
\ No newline at end of file
diff --git a/app/views/managements/shixun_feedback_message.js.erb b/app/views/managements/shixun_feedback_message.js.erb
index 135f4107..89ead852 100644
--- a/app/views/managements/shixun_feedback_message.js.erb
+++ b/app/views/managements/shixun_feedback_message.js.erb
@@ -1,2 +1,2 @@
 $("#management_shixun_feedback_list").html("<%= j(render :partial => 'shixun_feedback_list') %>");
-$("#shixun_search").attr("href", "<%= shixun_feedback_message_managements_path(:search => @search, :format => "xls") %>")
\ No newline at end of file
+$("#shixun_search").attr("href", "<%= shixun_feedback_message_managements_path(:search => @search, :beginTime => @beginTime, :endTime => @endTime,:format => "xls") %>")
\ No newline at end of file