educode_sales 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10da162d2ac59ca7795046ebe7239e9c3b64851c4b0ea8fb519eaf0667cd78bf
-  data.tar.gz: faf089944ea187641184a31781c809597ca0327eb3b9af8a553391c4d07366b3
+  metadata.gz: 7c243136aa29c06071bc7f5178e7c6eab7a7711c29a664ed12b4141b823102e1
+  data.tar.gz: db224456ae6c27346fadb5ae65b2ed6973ba11e1c384f2b833f994e6371540cb
 SHA512:
-  metadata.gz: 17fe4f762532aa69ab8f29e5c9c7f23aca27f0c22ac38fd7570d6a435039dd2a5b344db15104c2e15de9f0032a7e30f2b3c135cad7385bbb961cb3dd7e6eb167
-  data.tar.gz: 69fba60e0c97e2c9fbb1debf1ce4a1fab27527260ee87696b7d5861fa0c0ec6deb500efaa1eeafdebdaa3f19a0713e9ddb64c11317a608850c199e7a4bde78ec
+  metadata.gz: a5df7256338dc4a0bcc7f3ef6933c573f79b186a77ba12fcb10bcbfc80a11cfb3253d57ae2ea2325346a76c089fe9c9a71751407697bb4e3706ee6b58e11abf1
+  data.tar.gz: fa152803f2738331a1324e530275b6c31ff0420f5f725c537587b754555ae6eaeb0ce4bf5e522ef81ae109224e74b65effdf4435e7cb71e88fd11d6409c42580

data/app/controllers/educode_sales/activities_controller.rb

@@ -19,8 +19,6 @@ module EducodeSales
     end
 
     def new
-      # gon.area_ids = @place.area_ids
-      # gon.areas = Common.where(clazz: 'area').map { |d| { value: d.id, title: d.name } } #.unshift({value: -1, title: '全国'})
       render layout: false
     end
 

data/app/controllers/educode_sales/businesses_controller.rb

@@ -3,29 +3,6 @@ require_dependency "educode_sales/application_controller"
 module EducodeSales
   class BusinessesController < ApplicationController
 
-    def file
-      gon.folder = edu_setting('attachment_folder') + '/'
-      render layout: false
-    end
-    def upload_file
-      render layout: false
-    end
-    def time_line
-      @business = Business.find(params[:business_id])
-      respond_to do |format|
-        format.html do
-          @follow_ups = @business.follow_ups.order(created_at: :desc)
-          # @latest = @follow_ups.order(created_at: :desc).first
-          # if params[:field]
-          #   @follow_ups = @follow_ups.order("#{params[:field]} #{params[:order]}")
-          # else
-          #   @follow_ups = @follow_ups.order("created_at desc")
-          # end
-          # @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
-          render layout: false
-        end
-      end
-    end
 
     def index
       authorize! :read, Business
@@ -36,6 +13,7 @@ module EducodeSales
           # @more = can?(:create, EducodeSales::SalePlan) || can?(:update, EducodeSales::Business) || can?(:destroy, EducodeSales::Business) || can?(:show_file, EducodeSales::Business)
           @more = true
           gon.menus = []
+          gon.export_menus = []
           gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
           gon.business_type = Common.where(clazz: 'business_type').map do |d|
             {value: d.id, name: d.name}
@@ -53,11 +31,16 @@ module EducodeSales
             gon.menus << { title: '附件管理', event: 'file' }
           end
           if can?(:update, EducodeSales::Business)
-            gon.menus << { title: '编辑', event: 'edit' }
+            # gon.menus << { title: '编辑', event: 'edit' }
           end
           if can?(:destroy, EducodeSales::Business)
             gon.menus << { title: '删除', event: 'delete' }
           end
+          if can?(:export_business, EducodeSales::Business)
+            gon.export_menus << { title: '导出到Csv文件', event: 'export_csv' }
+            gon.export_menus << { title: '导出到Excel文件', event: 'export_excel' }
+          end
+          gon.export_menus << { title: '导出记录', event: 'export_records' }
         end
         format.json do
           if @current_admin.is_admin?
@@ -69,7 +52,7 @@ module EducodeSales
               business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
               @businesses = Business.where("educode_sales_businesses.staff_id = ? OR educode_sales_businesses.id in (?)", @current_admin.id, business_ids)
             when '区域'
-              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
               business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
               @businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}  OR educode_sales_businesses.id in (?)", school_ids, business_ids)
             else
@@ -81,41 +64,56 @@ module EducodeSales
             @year = params[:q][:name].split("-")[1].present? ? params[:q][:name].split("-")[1] : ''
           end
 
-          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-现有商机)"
-            a_id = Common.find_by(extras: EducodeSales::Common::ATYPE)&.id
-            b_id = Common.find_by(extras: EducodeSales::Common::BTYPE)&.id
-            c_id = Common.find_by(extras: EducodeSales::Common::CTYPE)&.id
-            d_id = Common.find_by(extras: EducodeSales::Common::DTYPE)&.id
-            e_id = Common.find_by(extras: EducodeSales::Common::ETYPE)&.id
-            o_id = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
-            ids = [a_id ,b_id ,c_id ,d_id ,e_id ,o_id]
-            @businesses = @businesses.joins("
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-现有商机)"
+            ids = Common.where(extras: %w[a_class b_class c_class d_class e_class o_class]).pluck(:id)
+            if @year == '全部'
+              @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
             ").where("educode_sales_follow_ups.clazz_id in (?)",ids)
+            else
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.clazz_id in (?)",ids).where("educode_sales_follow_ups.year = ?",@year)
+            end
+
           end
 
           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已中标商机)"
             stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-            @businesses = @businesses.joins("
+            if @year == '全部'
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id IN (?)",stage_ids)
+            else
+              @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
             ").where("educode_sales_follow_ups.bidded_date > ? AND educode_sales_follow_ups.bidded_date < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids)
+            end
+
           end
 
           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已签单商机)"
             s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-            @businesses = @businesses.joins("
+            if @year == '全部'
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id IN (?)",s_stage_ids)
+            else
+              @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
             ").where("educode_sales_follow_ups.signed_date > ? AND educode_sales_follow_ups.signed_date < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids)
+            end
           end
 
           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已回款商机)"
             x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
-            # @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ? AND educode_sales_businesses.return_money > 0", "#{@year}-01-01", "#{@year}-12-31").joins("
-            #   JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
-            # ").where.not("educode_sales_follow_ups.clazz_id = ?",x_id)
             year_time = "#{@year}-01-01 00:00:00"
             year_over_time = "#{@year}-12-31 23:59:59"
-            @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).distinct
+            if @year == '全部'
+              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", 1).distinct
+            else
+              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).distinct
+            end
           end
 
           if params[:q].present? && params[:q][:all].present?
@@ -129,7 +127,7 @@ module EducodeSales
           end
 
           @businesses = @businesses
-          if params[:q].present? && params[:q][:name].present? && params[:q][:name] != "(销售态势-" + @year + "-已中标商机)" && params[:q][:name] != "(销售态势-" + @year + "-已签单商机)" && params[:q][:name] != "(销售态势-" + @year + "-已回款商机)" && params[:q][:name] != "(销售态势-现有商机)"
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] != "(销售态势-" + @year + "-已中标商机)" && params[:q][:name] != "(销售态势-" + @year + "-已签单商机)" && params[:q][:name] != "(销售态势-" + @year + "-已回款商机)" && params[:q][:name] != "(销售态势-" + @year + "-现有商机)"
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
           end
           if params[:q].present? && params[:q][:department].present?
@@ -202,8 +200,6 @@ module EducodeSales
 
           @business_count = @businesses.count
 
-
-
           @businesses = @businesses.select("
             educode_sales_businesses.*,
             last_follow.invitation_at,
@@ -216,6 +212,7 @@ module EducodeSales
             last_follow.total_amount").joins("
             LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
           ").page(params[:page]).per(params[:limit])
+
         end
       end
     end
@@ -350,6 +347,225 @@ module EducodeSales
       render layout: false
     end
 
+    def file
+      gon.folder = edu_setting('attachment_folder') + '/'
+      render layout: false
+    end
+    def upload_file
+      render layout: false
+    end
+    def time_line
+      @business = Business.find(params[:business_id])
+      respond_to do |format|
+        format.html do
+          @follow_ups = @business.follow_ups.order(created_at: :desc)
+          render layout: false
+        end
+      end
+    end
+
+    def export_records
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+          @records = BusinessExportRecord.all.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+    def add_export_records
+      if params[:type] == 'csv'
+        record = BusinessExportRecord.new(name: '商机数据表.csv', staff_id: @current_admin.id)
+      else params[:type] == 'excel'
+        record = BusinessExportRecord.new(name: '商机数据表.xls', staff_id: @current_admin.id)
+      end
+      if record.save
+        render_success
+      else
+        render_failure business
+      end
+    end
+
+    def get_export_data
+      respond_to do |format|
+        format.html do
+        end
+        format.json do
+          if @current_admin.is_admin?
+            @businesses = Business
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
+            case level
+            when '自己'
+              business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
+              @businesses = Business.where("educode_sales_businesses.staff_id = ? OR educode_sales_businesses.id in (?)", @current_admin.id, business_ids)
+            when '区域'
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+              business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
+              @businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}  OR educode_sales_businesses.id in (?)", school_ids, business_ids)
+            else
+              @businesses = Business
+            end
+          end
+
+          if params[:name].present?
+            @year = params[:name].split("-")[1].present? ? params[:name].split("-")[1] : ''
+          end
+
+          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-现有商机)"
+            ids = Common.where(extras: %w[a_class b_class c_class d_class e_class o_class]).pluck(:id)
+            if @year == '全部'
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.clazz_id in (?)",ids)
+            else
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.clazz_id in (?)",ids).where("educode_sales_follow_ups.year = ?",@year)
+            end
+
+          end
+
+          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-已中标商机)"
+            stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
+            if @year == '全部'
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id IN (?)",stage_ids)
+            else
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.bidded_date > ? AND educode_sales_follow_ups.bidded_date < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids)
+            end
+
+          end
+
+          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-已签单商机)"
+            s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
+            if @year == '全部'
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id IN (?)",s_stage_ids)
+            else
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.signed_date > ? AND educode_sales_follow_ups.signed_date < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids)
+            end
+          end
+
+          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-已回款商机)"
+            x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+            year_time = "#{@year}-01-01 00:00:00"
+            year_over_time = "#{@year}-12-31 23:59:59"
+            if @year == '全部'
+              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", 1).distinct
+            else
+              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).distinct
+            end
+          end
+
+          if params[:all].present?
+            @businesses = @businesses
+          end
+
+          if params[:mine].present?
+            ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+            ids1 = FollowUp.where(id: ids).pluck(:business_id)
+            @businesses =@businesses.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id)
+          end
+
+          @businesses = @businesses
+          if params[:name].present? && params[:name] != "(销售态势-" + @year + "-已中标商机)" && params[:name] != "(销售态势-" + @year + "-已签单商机)" && params[:name] != "(销售态势-" + @year + "-已回款商机)" && params[:name] != "(销售态势-" + @year + "-现有商机)"
+            @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:name]}%")
+          end
+          if params[:department].present?
+            departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:department]}%").pluck(:id)
+            @businesses = @businesses.joins(:department).where("departments.id in (?)", departments_ids)
+          end
+          if params[:staff_id].present?
+            part_a_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is null AND educode_sales_businesses.staff_id = ?",params[:staff_id]).ids
+            part_b_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is not null").joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.staff_id = ?", params[:staff_id]).ids
+            business_ids = part_a_ids + part_b_ids
+            @businesses = EducodeSales::Business.where(id:business_ids)
+          end
+          if params[:business_type].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.clazz_id in (?)", params[:business_type].split(",").map(&:to_i))
+          end
+          if params[:business_step].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id in (?)", params[:business_step].split(",").map(&:to_i))
+          end
+          if  params[:place_id].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.place_id = ?", params[:place_id])
+          end
+
+          if params[:area].present?
+            p = EducodeSales::Common.find(params[:area]).name
+            if @current_admin.is_admin?
+              @businesses = @businesses.joins("
+              JOIN departments ON educode_sales_businesses.department_id = departments.id
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+            else
+              level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
+              if level == "区域"
+                @businesses = @businesses.joins("
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+              else
+                @businesses = @businesses.joins("
+              JOIN departments ON educode_sales_businesses.department_id = departments.id
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+              end
+            end
+          end
+
+          if params[:date].present?
+            date = params[:date].split(" - ")
+            @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1] + '23:59:59')
+          end
+
+          if params[:invitation_at].present?
+            date = params[:invitation_at].split(" - ")
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.invitation_at > ? AND educode_sales_follow_ups.invitation_at < ?", date[0] + '00:00:00', date[1] + '23:59:59')
+          end
+
+          if params[:sort].present? && params[:sort][:field]
+            @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @businesses = @businesses.order("educode_sales_businesses.created_at desc")
+          end
+
+          @business_count = @businesses.count
+
+          @businesses = @businesses.select("
+            educode_sales_businesses.*,
+            last_follow.invitation_at,
+            last_follow.reception_at,
+            last_follow.bidded_date,
+            last_follow.signed_date,
+            last_follow.created_at as latest_time,
+            last_follow.actual_amount,
+            (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
+            last_follow.total_amount").joins("
+            LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
+          ")
+
+        end
+      end
+    end
+
     private
 
     def load_business

data/app/controllers/educode_sales/customers_controller.rb

@@ -51,13 +51,16 @@ module EducodeSales
             when '区域'
               a_school_ids = School.where(province: @current_admin.areas.pluck(:name)).ids
               b_school_ids = CustomerExtension.where(customer_staff_id:  @current_admin.id).pluck(:school_id)
-              school_ids = a_school_ids + b_school_ids
+              school_ids = a_school_ids + b_school_ids + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
               @customers = School.where(id: school_ids)
             else
               @customers = School.all
             end
           end
-
+          part_a_ids = CustomerFollow.all.pluck(:school_id)
+          part_b_ids = Business.where(id: EducodeSales::FollowUp.pluck(:business_id)).pluck(:school_id)
+          ids = part_a_ids + part_b_ids  + CustomerAdd.all.pluck(:school_id)
+          @customers = @customers.where(id: ids)
           if params[:q].present? && params[:q][:name].present?
             @customers = @customers.where("schools.name like ?", "%#{params[:q][:name]}%")
           end
@@ -68,6 +71,30 @@ module EducodeSales
             school_ids = EducodeSales::CustomerExtension.where(customer_staff_id: params[:q][:staff_id]).pluck(:school_id)
             @customers = @customers.where(id: school_ids)
           end
+          if params[:q].present? && params[:q][:property].present?
+            school_property_ids = []
+            property = params[:q][:property].split(",").map(&:to_i)
+            property.each do |p|
+              case p
+              when 0
+                school_property_ids += SchoolProperty.where( project_985: true ).ids
+              when 1
+                school_property_ids += SchoolProperty.where( project_211: true ).ids
+              when 2
+                school_property_ids += SchoolProperty.where( regular_college: true ).ids
+              when 3
+                school_property_ids += SchoolProperty.where( junior_college: true ).ids
+              when 4
+                school_property_ids += SchoolProperty.where( secondary_school: true ).ids
+              when 5
+                school_property_ids += SchoolProperty.where( military_school: true ).ids
+              when 6
+                school_property_ids += SchoolProperty.where( enterprise: true ).ids
+              else
+              end
+            end
+            @customers = @customers.where(school_property_id: school_property_ids)
+          end
 
           if params[:q].present? && params[:q][:date].present?
             ids = EducodeSales::CustomerFollow.all.pluck(:school_id)
@@ -149,20 +176,26 @@ module EducodeSales
       render layout: false
     end
 
+    # def create
+    #   ActiveRecord::Base.transaction do
+    #     property = SchoolProperty.find_or_create_by!(project_985: params[:project_985].present? ? 1 : 0,
+    #                                                  project_211: params[:project_211].present? ? 1 : 0,
+    #                                                  regular_college: params[:regular_college].present? ? 1 : 0,
+    #                                                  junior_college: params[:junior_college].present? ? 1 : 0,
+    #                                                  secondary_school: params[:secondary_school].present? ? 1 : 0,
+    #                                                  military_school: params[:military_school].present? ? 1 : 0,
+    #                                                  enterprise: params[:enterprise].present? ? 1 : 0)
+    #     @school = School.new
+    #     @school.attributes = school_params
+    #     @school.school_property = property
+    #     @school.save!
+    #     EducodeSales::CustomerExtension.create(customer_staff_id: @current_admin.id, school_id: @school.id)
+    #   end
+    #   render_success
+    # end
     def create
-      ActiveRecord::Base.transaction do
-        property = SchoolProperty.find_or_create_by!(project_985: params[:project_985].present? ? 1 : 0,
-                                                     project_211: params[:project_211].present? ? 1 : 0,
-                                                     regular_college: params[:regular_college].present? ? 1 : 0,
-                                                     junior_college: params[:junior_college].present? ? 1 : 0,
-                                                     secondary_school: params[:secondary_school].present? ? 1 : 0,
-                                                     military_school: params[:military_school].present? ? 1 : 0,
-                                                     enterprise: params[:enterprise].present? ? 1 : 0)
-        @school = School.new
-        @school.attributes = school_params
-        @school.school_property = property
-        @school.save!
-        EducodeSales::CustomerExtension.create(customer_staff_id: @current_admin.id, school_id: @school.id)
+      params[:school_ids].each do |d|
+        CustomerAdd.create(school_id: d)
       end
       render_success
     end

data/app/controllers/educode_sales/home_controller.rb

@@ -57,6 +57,12 @@ module EducodeSales
         @staffs = @staffs.where(is_admin: false).where.not(id: @current_admin.id).where(job_type: common.id).page(params[:page]).per(10)
       end
     end
+    def staff_schools
+      @schools = School.all
+      if params[:q].present?
+        @schools = @schools.where("name like :q OR province like :q",q: "%#{params[:q]}%").page(params[:page]).per(10)
+      end
+    end
 
     def sales_place
       @places = EducodeSales::Place

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -19,10 +19,10 @@ module EducodeSales
             level = @current_admin.role.role_areas.find_by(clazz: '回款管理').level
             case level
             when '自己'
-              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.staff_id)
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.id)
             when '区域'
-              a_ids = MoneyPlan.where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.staff_id).ids
-              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+              a_ids = MoneyPlan.where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.id).ids
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
               b_ids = Business.where(school_id: school_ids).pluck(:last_follow_up_id)
               ids = a_ids + b_ids
               @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(id: ids)

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -20,7 +20,7 @@ module EducodeSales
             when '自己'
               @sale_plans = OperationPlan.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?) OR schools.id in (?)", @current_admin.areas.pluck(:name), StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)).pluck(:id)
               @sale_plans = OperationPlan.where("staff_id in (?) OR educode_sales_operation_plans.staff_id = ?", staff_ids, @current_admin.id)
             else
               @sale_plans = OperationPlan

data/app/controllers/educode_sales/plans_controller.rb

@@ -21,7 +21,7 @@ module EducodeSales
             when '自己'
               @sale_plans = SalePlan.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?) OR schools.id in (?)", @current_admin.areas.pluck(:name),StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)).pluck(:id)
               @sale_plans = SalePlan.where("staff_id in (?) OR educode_sales_sale_plans.staff_id = ?", staff_ids, @current_admin.id)
             else
               @sale_plans = SalePlan