educode_sales 0.6.7 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6dbbb6a86049648541dc1d2fb1ec36eec9e24562bd17693725b1e3b498be3c0
-  data.tar.gz: 7d4dffa34c61c38e66664d685244f4485d1cf7021c7115fb52903155efd3aac8
+  metadata.gz: fd1dede8ec609b98a19dcd71c21bac7b6024098a7cdb8bad5c600784bd9a649e
+  data.tar.gz: 34bdddc9c368c11588d2d9dc0a3307f8cfbc4568489f539e344b13f32bf41702
 SHA512:
-  metadata.gz: dc84606ad701fb65520d5be1d79f59c83bad909b93fb3d6b4b61b7bc22e037c7b58a94bd9f13f9d8f9bfc6a37d891a168e04c23453fb5590fb4e479878025ed2
-  data.tar.gz: fefca5856e9a3c84876b2dcff7fd9c7415ca1d935f141a367b4dcc3c6b549965febef90454afcfe6462b93fd716a38b21b1899947fe0292353c5dc9f7dfaaaf3
+  metadata.gz: 372e451790e777e0c9df20e7bdd9bc133e4d15351c6ae5b541c53a9761b14c2cbd5645c7517d0ae20ea4301872592fd43de82013ae90166546b5ae647b59db32
+  data.tar.gz: f9a5c5518474de3e1aa03e2fe1fae7bbede839df9649227e1c0c0ddba1f4aaaf62e3e903c813c3115dd7d792d56e48e9c6659226cf0ed4b29169ac1198dda8a4

data/app/controllers/educode_sales/businesses_controller.rb

@@ -31,7 +31,7 @@ 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' }
@@ -52,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
@@ -200,20 +200,20 @@ module EducodeSales
 
           @business_count = @businesses.count
 
-          @businesses_exports = @businesses.select("
+          @businesses = @businesses.select("
             educode_sales_businesses.*,
             last_follow.invitation_at,
             last_follow.reception_at,
             last_follow.bidded_date,
             last_follow.signed_date,
+            last_follow.year,
             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
-          ")
+          ").page(params[:page]).per(params[:limit])
 
-          @businesses = @businesses_exports.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -371,7 +371,7 @@ module EducodeSales
           render layout: false
         end
         format.json do
-          @records = BusinessExportRecord.all.page(params[:page]).per(params[:limit])
+          @records = BusinessExportRecord.all.order(id: :desc).page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -388,6 +388,185 @@ module EducodeSales
       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/follow_ups_controller.rb

@@ -20,7 +20,7 @@ module EducodeSales
               business_ids = @businesses.pluck(:id)
               @follow_ups = FollowUp.where(business_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)
               business_ids = @businesses.pluck(:id)

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

@@ -21,11 +21,11 @@ module EducodeSales
             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.id)
             when '区域'
-              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)
+              a_ids = MoneyPlan.where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.id).pluck(:follow_up_id)
+              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)
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: ids)
             else
               @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids)
             end

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -21,7 +21,10 @@ module EducodeSales
               @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)
-              @sale_plans = OperationPlan.where("staff_id in (?) OR educode_sales_operation_plans.staff_id = ?", staff_ids, @current_admin.id)
+              school_ids = StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
+              department_ids = Department.where(school_id: school_ids).pluck(:id)
+              teacher_ids = Teacher.where(department_id: department_ids).pluck(:id)
+              @sale_plans = OperationPlan.where("staff_id in (?) OR educode_sales_operation_plans.staff_id = ? OR educode_sales_operation_plans.teacher_id in (?)", staff_ids, @current_admin.id,teacher_ids)
             else
               @sale_plans = OperationPlan
             end

data/app/controllers/educode_sales/plans_controller.rb

@@ -22,7 +22,8 @@ module EducodeSales
               @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)
-              @sale_plans = SalePlan.where("staff_id in (?) OR educode_sales_sale_plans.staff_id = ?", staff_ids, @current_admin.id)
+              business_ids = Business.where(school_id: 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 = ? OR educode_sales_sale_plans.business_id in (?)", staff_ids, @current_admin.id,business_ids)
             else
               @sale_plans = SalePlan
             end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -162,10 +162,12 @@ module EducodeSales
       when 'diy'
         if params[:customer_date].present?
           date = params[:customer_date].split(" - ")
-          begin_time = date[0]
-          end_time = date[1]
+          begin_time = date[0] + "00:00:00"
+          end_time = date[1] + "23:59:59"
         end
       end
+      100.times{p begin_time}
+      100.times{p end_time}
       common = Common.find_by(clazz: 'staff_type', name: '销售')
       staff_names = Staff.joins(:user).where(job_type: common.id).map { |d| d.user.real_name}
       staff_ids = Staff.joins(:user).where(job_type: common.id).pluck(:id)

data/app/controllers/educode_sales/staffs_controller.rb

@@ -9,6 +9,25 @@ module EducodeSales
         end
         format.json do
           @staffs = Staff.where(is_admin: false, deleted_at: nil).page(params[:page]).per(params[:limit])
+          if params[:q].present? && params[:q][:name].present?
+            @staffs = @staffs.joins(:user).where('CONCAT(lastname, firstname) LIKE :name', name: "%#{params[:q][:name]}%")
+          end
+          if params[:q].present? && params[:q][:role].present?
+            @staffs = @staffs.where(role: params[:q][:role])
+          end
+          if params[:q].present? && params[:q][:staff_id].present?
+            @staffs = @staffs.where(staff_id: params[:q][:staff_id])
+          end
+          if params[:q].present? && params[:q][:staff_type].present?
+            @staffs = @staffs.where(job_type: params[:q][:staff_type])
+          end
+          if params[:q].present? && params[:q][:banned].present?
+            if params[:q][:banned] == "0"
+              @staffs = @staffs.where("educode_sales_staffs.expired_at is null or educode_sales_staffs.expired_at > ?", Time.now)
+            else
+              @staffs = @staffs.where("educode_sales_staffs.expired_at is null or educode_sales_staffs.expired_at < ?", Time.now)
+            end
+          end
         end
       end
     end
@@ -27,6 +46,10 @@ module EducodeSales
       @staff = Staff.find(params[:id])
       gon.area_ids = @staff.area_ids
       gon.areas = Common.where(clazz: 'area').map { |d| { value: d.id, title: d.name } } #.unshift({value: -1, title: '全国'})
+      gon.school_ids = @staff.staff_schools.ids
+      gon.schools = @staff.staff_schools.pluck(:school_id).map { |d| { value: d, name: "#{School.find(d)&.name}-#{School.find(d)&.province}" } } #.unshift({value: -1, title: '全国'})
+      # gon.school_ids = School.all.ids
+      # gon.schools = School.all.first(100).map { |d| { value: d.id, title: d.name } } #.unshift({value: -1, title: '全国'})
       @staff_types = Common.where(clazz: 'staff_type').pluck(:name, :id)
       render layout: false
     end
@@ -58,6 +81,14 @@ module EducodeSales
         commons << Common.find(d)
       end
       staff.areas = commons
+      if params[:school_ids].present?
+        staff.staff_schools.destroy_all
+        params[:school_ids].each do |d|
+          staff.staff_schools.create(school_id: d)
+        end
+      else
+        staff.staff_schools.destroy_all
+      end
       if staff.save
         render_success
       else

data/app/controllers/educode_sales/teachers_controller.rb

@@ -48,7 +48,7 @@ module EducodeSales
               teacher_ids = EducodeSales::Teacher.where(staff_id: 0).pluck(:id) - EducodeSales::TeacherAssignFollow.all.pluck(:Teacher_id) + EducodeSales::TeacherAssignFollow.where(staff_id: @current_admin.id).pluck(:teacher_id) + @teachers.ids
               @teachers = Teacher.where(id: teacher_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)
               @teachers = Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where(is_key: false).where("departments.school_id in (?) OR educode_sales_teachers.staff_id = #{@current_admin.id}", school_ids)
               teacher_ids = EducodeSales::Teacher.where(staff_id: 0).pluck(:id) - EducodeSales::TeacherAssignFollow.all.pluck(:Teacher_id) + EducodeSales::TeacherAssignFollow.where(staff_id: @current_admin.id).pluck(:teacher_id) + @teachers.ids
               @teachers = Teacher.where(id: teacher_ids)

data/app/models/educode_sales/customer_add.rb

@@ -0,0 +1,4 @@
+module EducodeSales
+  class CustomerAdd < ApplicationRecord
+  end
+end

data/app/models/educode_sales/staff.rb

@@ -14,6 +14,7 @@ module EducodeSales
     has_many :businesses, dependent: :destroy
     has_many :activities, dependent: :destroy
     has_many :sale_plans, dependent: :destroy
+    has_many :staff_schools, dependent: :destroy
 
     has_many :areas, through: :market_areas
     validates :user_id, uniqueness: { message: '已存在' }

data/app/models/educode_sales/staff_school.rb

@@ -0,0 +1,6 @@
+module EducodeSales
+  class StaffSchool < ApplicationRecord
+    belongs_to :school
+    belongs_to :staff
+  end
+end

data/app/views/educode_sales/businesses/get_export_data.json.jbuilder

@@ -0,0 +1,30 @@
+json.data do
+  json.array! @businesses do |d|
+    json.id d.id
+    json.name d.name
+    json.department d.department.name
+    json.school d.department.school.name
+    json.school_id d.department.school.id
+    follow_ups_count = d.follow_ups.where(deleted_at: nil).size
+    json.follow_ups_count follow_ups_count
+    json.follow_up_id d.last_follow_up_id
+    json.clazz d.last_follow_up&.clazz&.name || ""
+    json.stage d.last_follow_up&.stage&.name
+    json.invitation_at d.last_follow_up&.invitation_at.to_s
+    json.reception_at d.last_follow_up&.reception_at.to_s
+    json.bidded_date d.last_follow_up&.bidded_date.to_s
+    json.signed_date d.last_follow_up&.signed_date.to_s
+    json.total_amount d.last_follow_up&.total_amount
+    json.actual_amount d.last_follow_up&.actual_amount
+    json.return_money d.return_money
+    json.wait_return_money d.wait_return_money.to_i.round(2)
+    json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '已完成').present? ? (d.last_follow_up.money_plans.where(clazz: '已完成').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
+    json.place d.last_follow_up&.place&.name
+    json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
+    json.source d.source
+    json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
+    json.current_staff_id @current_admin.id
+    json.staff_id d.staff_id
+    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
+  end
+end