销售渠道

app/models/salesman_channel.rb

@@ -6,23 +6,20 @@ class SalesmanChannel < ApplicationRecord
     school.name
   end
 
-  def teacher_count(start_time, end_time, keyword)
-    UserExtension.joins(:school).where("schools.name like '%#{keyword}%' and user_extensions.identity=0
-                                        and user_extensions.created_at between '#{start_time}' and '#{end_time}'").count
-    # UserExtension.where(school_id: school_id).where(query).count
+  def teacher_count
+    UserExtension.where(school_id: school_id).where.not(identity: 1).count
   end
 
-  def student_count(start_time, end_time, keyword)
-    UserExtension.joins(:school).where("schools.name like '%#{keyword}%' and user_extensions.identity=1
-                                        and user_extensions.created_at between '#{start_time}' and '#{end_time}'").count
+  def student_count
+    UserExtension.where(school_id: school_id, identity: 1).count
   end
 
-  def course_count(start_time, end_time, keyword)
-    Course.joins(:school).where("schools.name like '%#{keyword}%' and courses.created_at between '#{start_time}' and '#{end_time}'").count
+  def course_count
+    Course.where(school_id: school_id).count
   end
 
-  def shixuns_count(start_time, end_time, keyword)
-    ShixunMember.joins("join user_extensions on user_extensions.user_id = shixun_members.user_id and shixun_members.created_at between '#{start_time}' and '#{end_time}'")
+  def shixuns_count
+    ShixunMember.joins("join user_extensions on user_extensions.user_id = shixun_members.user_id")
         .where(user_extensions: {school_id: school_id}).pluck(:shixun_id).uniq.count
   end
 

app/views/admins/salesman_channels/index.html.erb

@@ -2,32 +2,12 @@
   <% add_admin_breadcrumb("#{@salesman.name}的渠道", admins_salesmans_path) %>
 <% end %>
 
-<% define_admin_breadcrumbs do %>
-  <% add_admin_breadcrumb('数据变化报表', admins_school_statistics_path) %>
-<% end %>
-
-<div class="box search-form-container saleman-channel-list-form">
-  <form class="form-inline search-form d-flex" data-search-form-url="<%= admins_salesman_channels_path %>">
-    <div class="time-select">
-      <div class="form-group grow-date-container">
-        <div class="input-group input-daterange grow-date-input-daterange">
-          <%= text_field_tag :start_date, params[:start_date], class: 'form-control start-date mx-0', placeholder: '开始时间' %>
-          <div class="input-group-prepend"><span class="input-group-text">到</span></div>
-          <%= text_field_tag :end_date, params[:start_date], class: 'form-control end-date mx-0', placeholder: '结束时间' %>
-        </div>
-      </div>
-
-    </div>
-    <%= text_field_tag :keyword, params[:keyword], placeholder: 'ID/单位名称检索', class: 'form-control mx-3 search-input' %>
-
-    <%= javascript_void_link '搜索', class: 'btn btn-primary search-btn', target: '' %>
-  </form>
-  <div class="flex-12">
+<div class="box search-form-container salesman-channel-list-form rig">
+  <div class="flex-1">
     <%= javascript_void_link '新增渠道', class: 'btn btn-primary', data: {salesman_id: @salesman.id, toggle: 'modal', target: '.admin-add-salesman-channel-user-modal' } %>
   </div>
 </div>
 
-
 <div class="box admin-list-container salesman-channel-list-container">
   <%= render(partial: 'admins/salesman_channels/shared/list') %>
 </div>

app/views/admins/salesman_channels/shared/_list.html.erb

@@ -19,16 +19,16 @@
           <span><%= channel.school_name %></span>
         </td>
         <td class="text-left">
-          <span><%= channel.teacher_count(@start_time, @end_time, @keyword)  %></span>
+          <span><%= channel.teacher_count %></span>
         </td>
         <td class="text-left">
-          <span><%= channel.student_count(@start_time, @end_time, @keyword)  %></span>
+          <span><%= channel.student_count %></span>
         </td>
         <td>
-          <%=  channel.course_count(@start_time, @end_time, @keyword)  %>
+          <%=  channel.course_count %>
         </td>
         <td>
-          <%= channel.shixuns_count(@start_time, @end_time, @keyword)   %>
+          <%= channel.shixuns_count  %>
         </td>
         <td>
           <%= delete_link '删除', admins_salesman_channel_path(channel, salesman_id: channel.salesman_id, element: ".salesman-channel-item-#{channel.id}"), class: 'delete-salesman-action' %>