diff --git a/app/models/salesman_channel.rb b/app/models/salesman_channel.rb index b5ae17e0e..0aee5f635 100644 --- a/app/models/salesman_channel.rb +++ b/app/models/salesman_channel.rb @@ -6,20 +6,23 @@ class SalesmanChannel < ApplicationRecord school.name end - def teacher_count - UserExtension.where(school_id: school_id).where.not(identity: 1).count + 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 end - def student_count - UserExtension.where(school_id: school_id, identity: 1).count + 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 end - def course_count - Course.where(school_id: school_id).count + 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 end - def shixuns_count - ShixunMember.joins("join user_extensions on user_extensions.user_id = shixun_members.user_id") + 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}'") .where(user_extensions: {school_id: school_id}).pluck(:shixun_id).uniq.count end diff --git a/app/views/admins/salesman_channels/index.html.erb b/app/views/admins/salesman_channels/index.html.erb index 5e15d63eb..237ef61d5 100644 --- a/app/views/admins/salesman_channels/index.html.erb +++ b/app/views/admins/salesman_channels/index.html.erb @@ -2,12 +2,32 @@ <% add_admin_breadcrumb("#{@salesman.name}的渠道", admins_salesmans_path) %> <% end %> -
-
+<% define_admin_breadcrumbs do %> + <% add_admin_breadcrumb('数据变化报表', admins_school_statistics_path) %> +<% end %> + +
+
+
+
+
+ <%= text_field_tag :start_date, params[:start_date], class: 'form-control start-date mx-0', placeholder: '开始时间' %> +
+ <%= text_field_tag :end_date, params[:start_date], class: 'form-control end-date mx-0', placeholder: '结束时间' %> +
+
+ +
+ <%= 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: '' %> +
+
<%= javascript_void_link '新增渠道', class: 'btn btn-primary', data: {salesman_id: @salesman.id, toggle: 'modal', target: '.admin-add-salesman-channel-user-modal' } %>
+
<%= render(partial: 'admins/salesman_channels/shared/list') %>
diff --git a/app/views/admins/salesman_channels/shared/_list.html.erb b/app/views/admins/salesman_channels/shared/_list.html.erb index 12100ce48..4e276b115 100644 --- a/app/views/admins/salesman_channels/shared/_list.html.erb +++ b/app/views/admins/salesman_channels/shared/_list.html.erb @@ -19,16 +19,16 @@ <%= channel.school_name %> - <%= channel.teacher_count %> + <%= channel.teacher_count(@start_time, @end_time, @keyword) %> - <%= channel.student_count %> + <%= channel.student_count(@start_time, @end_time, @keyword) %> - <%= channel.course_count %> + <%= channel.course_count(@start_time, @end_time, @keyword) %> - <%= channel.shixuns_count %> + <%= channel.shixuns_count(@start_time, @end_time, @keyword) %> <%= delete_link '删除', admins_salesman_channel_path(channel, salesman_id: channel.salesman_id, element: ".salesman-channel-item-#{channel.id}"), class: 'delete-salesman-action' %>