educode_sales 0.5.5 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c060696641e16a80fea2b02631788112e85082b8ccba0a037a2635d6563dbe24
-  data.tar.gz: 07230a0582b71a0ebfceddc1ce347a667651f778fed3640a0c82b22ee952f620
+  metadata.gz: 82398cf1df1cb40215b1632031edfd6b6ffa4dfed2ff1c8f86c624fa938c917c
+  data.tar.gz: b11d133013cc1dfe416f77b26255709fb24b33061568380abf625012b13b4ee0
 SHA512:
-  metadata.gz: 110a25d3261f894f5ce6c5fed8e08d7afd62dd186ce6e18a10fe8d7f68033f03e48e2bdeca23df1408495e608899fc1383e5f3a0da25f1c13736b04488179820
-  data.tar.gz: 876c22dbca43a2624dbb2407cd5520c1ea0e044d696b4e3adb9571d65220560b0de3c13ecb337a9d914097b93cce6373db0a598dc5be440bbd925ee8744f995e
+  metadata.gz: ee3920c928e0d06ba4785d0a5ab091b9833d94c42eb881e879c378d36d71f6c75985299b225c198b9abf0f2d5d9a6e133a5afeb7147c87e6523bcde609f07f30
+  data.tar.gz: 14a4f1e5e7f23f94279b9023656d170fed8cf6b3d1a6a034b71cca658bc4d0ab13c27f8d82b589a747f02fca5f53fda1a224c7fb76d1a7f25db4552b2a9ac53d

data/app/controllers/educode_sales/businesses_controller.rb

@@ -35,6 +35,7 @@ module EducodeSales
           @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
           @more = can?(:create, EducodeSales::SalePlan) || can?(:update, EducodeSales::Business) || can?(:destroy, EducodeSales::Business)
           gon.menus = []
+          gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
           if can?(:create, EducodeSales::SalePlan)
             gon.menus << { title: '添加周计划', event: 'week' }
             gon.menus << { title: '添加月计划', event: 'month' }
@@ -149,10 +150,24 @@ module EducodeSales
 
           if params[:q].present? && params[:q][:area].present?
             p = EducodeSales::Common.find(params[:q][:area]).name
-            @businesses = @businesses.joins("
+            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[:q].present? && params[:q][:date].present?
@@ -261,6 +276,7 @@ module EducodeSales
 
     def new_follow_record
       load_business
+      @years = (2015..Time.now.year).to_a.reverse
       @o_name = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.name
       @clazz = Common.where(clazz: 'business_type').order("position").pluck(:name, :id)
       @stages = Common.where(clazz: 'business_step').order("position").pluck(:name, :id)
@@ -270,6 +286,7 @@ module EducodeSales
         gon.sales = @last_follow_up.assign_follow_ups.map do |d|
           {value: d.staff_id, name: d.staff.user.full_name}
         end
+        gon.place = @last_follow_up.place.present? ? [{ value: @last_follow_up.place&.id, name: @last_follow_up.place&.name }] : []
       end
       render layout: false
     end
@@ -295,6 +312,7 @@ module EducodeSales
     end
 
     def edit_follow_record
+      @years = (2015..Time.now.year).to_a.reverse
       @o_name = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.name
       @follow_up = FollowUp.find(params[:follow_up_id])
       @clazz = Common.where(clazz: 'business_type').order("position").pluck(:name, :id)
@@ -303,6 +321,7 @@ module EducodeSales
       gon.sales = @follow_up.assign_follow_ups.map do |d|
         {value: d.staff_id, name: d.staff.user.full_name}
       end
+      gon.place = @follow_up.place.present? ? [{ value: @follow_up.place&.id, name: @follow_up.place&.name }] : [value: '', name: '']
       render layout: false
     end
 

data/app/controllers/educode_sales/customer_extensions_controller.rb

@@ -0,0 +1,17 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class CustomerExtensionsController < ApplicationController
+
+    def create
+      params[:school_ids].each do |d|
+        if EducodeSales::CustomerExtension.find_by(school_id: d).present?
+          EducodeSales::CustomerExtension.find_by(school_id: d).update(customer_staff_id: params[:staff_id])
+        else
+          EducodeSales::CustomerExtension.create(customer_staff_id: params[:staff_id], school_id: d)
+        end
+      end
+        render_success
+      end
+    end
+  end

data/app/controllers/educode_sales/customer_follows_controller.rb

@@ -0,0 +1,41 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class CustomerFollowsController < ApplicationController
+    def create
+      follow_up = EducodeSales::CustomerFollow.new(follow_up_params)
+      follow_up.staff = @current_admin
+      if follow_up.save
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+
+    def destroy
+      follow_up = CustomerFollow.find(params[:id])
+      if follow_up.destroy
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+
+    def update
+      follow_up = CustomerFollow.find(params[:id])
+      follow_up.assign_attributes(follow_up_params)
+      if follow_up.save
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+
+    private
+
+    def follow_up_params
+      params.permit(:school_id, :department_id, :content)
+    end
+
+  end
+end

data/app/controllers/educode_sales/customers_controller.rb

@@ -0,0 +1,194 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class CustomersController < ApplicationController
+    # before_action :find_school, only: [:edit, :update]
+    # before_action :must_admin!, only: [:destroy]
+
+    def new_department
+      render layout: false
+    end
+    def create_department
+        department_name = params[:department_name].to_s.strip
+        school = School.find(params[:school_id])
+
+        return render_failure('部门名称重复') if school.departments.exists?(name: department_name)
+
+        ActiveRecord::Base.transaction do
+          department = school.departments.create!(name: department_name, is_auth: 1)
+          ApplyAddDepartment.create!(school_id: school.id, status: 1, name: department.name,
+                                     department_id: department.id, user_id: current_user.id)
+        end
+
+        render_success
+    end
+
+    def edit_department
+      @department = Department.find(params[:id])
+      render layout: false
+    end
+    def update_department
+      department = Department.find(params[:id])
+      department.update(name: params[:department_name])
+      render_success
+    end
+
+
+    def index
+      authorize! :read, Customer
+      respond_to do |format|
+        format.html do
+          common = Common.find_by(clazz: 'staff_type', name: '销售')
+          @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
+        end
+        format.json do
+          if @current_admin.is_admin?
+            @customers = School
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '客户管理').level
+            case level
+            when '自己'
+              school_ids = CustomerExtension.where(customer_staff_id:  @current_admin.id).pluck(:school_id)
+              @customers = School.where(id: school_ids)
+            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
+              @customers = School.where(id: school_ids)
+            else
+              @customers = School
+            end
+          end
+
+          if params[:q].present? && params[:q][:name].present?
+            @customers = @customers.where("schools.name like ?", "%#{params[:q][:name]}%")
+          end
+          if params[:q].present? && params[:q][:area].present?
+            @customers = @customers.where("schools.province = ?", "#{params[:q][:area]}")
+          end
+          if params[:q].present? && params[:q][:staff_id].present?
+            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][:date].present?
+          #   department_ids =
+          #   business_ids = EducodeSales::Business.where(department_id: department_ids).ids
+          #   follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
+          #   customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
+          #   a_last_follow_time = follow_ups.last&.created_at&.to_s(:date)
+          #   b_last_follow_time = customer_follows.last&.created_at&.to_s(:date)
+          #   if a_last_follow_time.present? && b_last_follow_time.present?
+          #     json.last_follow_time a_last_follow_time < b_last_follow_time ? b_last_follow_time : a_last_follow_time
+          #   else
+          #     json.last_follow_time a_last_follow_time || b_last_follow_time
+          #   end
+          #   date = params[:q][:date].split(" - ")
+          #   @customers = @customers.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1])
+          # end
+
+          @customers = @customers.order(id: :desc).page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def give
+      common = Common.find_by(clazz: 'staff_type', name: '销售')
+      @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
+      render layout: false
+    end
+
+    def show_follow
+      respond_to do |format|
+        format.html do
+          @school_name = School.find(params[:id]).name
+          @area = School.find(params[:id]).province
+          @staff = EducodeSales::CustomerExtension.find_by(school_id: params[:id])&.customer_staff&.user&.real_name
+          render layout: false
+        end
+        format.json do
+          @follow_ups = EducodeSales::CustomerFollow.where(school_id: params[:id])
+          @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.order("created_at desc")
+          @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def show_department
+      @departments = School.find(params[:id]).departments
+      # if params[:field]
+      #   @follow_ups = @follow_ups.order("#{params[:field]} #{params[:order]}")
+      # else
+      #   @follow_ups = @follow_ups.order("created_at desc")
+      # end
+      @departments = @departments.order("created_at desc")
+      @departments = @departments.page(params[:page]).per(params[:limit])
+    end
+
+
+    def new_follow_record
+      @school = School.find(params[:id])
+      render layout: false
+    end
+
+    def show_follow_record
+      @follow_up = EducodeSales::CustomerFollow.find(params[:id])
+      @school = School.find(@follow_up.school_id)
+      render layout: false
+    end
+
+    def edit_follow_record
+      @follow_up = EducodeSales::CustomerFollow.find(params[:id])
+      @school = School.find(@follow_up.school_id)
+      render layout: false
+    end
+
+    def new
+      render layout: false
+    end
+
+    def create
+      @school = School.find(params[:id])
+      ActiveRecord::Base.transaction do
+        property = SchoolProperty.find_or_create_by!(school_property_params)
+        @school = School.new
+        @school.attributes = school_params
+        @school.school_property = property
+        @school.save!
+      end
+    end
+
+    def edit
+      @school = School.find(params[:id])
+      render layout: false
+    end
+
+    def update
+      @school = School.find(params[:id])
+      ActiveRecord::Base.transaction do
+        property = SchoolProperty.find_or_create_by!(school_property_params)
+        @school.attributes = school_params
+        @school.school_property = property
+        @school.save!
+      end
+    end
+
+    private
+
+
+    def school_property_params
+      params.require(:school).permit(:project_985, :project_211, :regular_college, :junior_college, :secondary_school, :military_school, :enterprise)
+    end
+
+    def school_params
+      params.require(:school).permit(:name, :province, :city, :address)
+    end
+
+  end
+end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -3,6 +3,63 @@ require_dependency "educode_sales/application_controller"
 module EducodeSales
   class FollowUpsController < ApplicationController
 
+    def index
+      authorize! :read, Business
+      respond_to do |format|
+        format.html do
+        end
+        format.json do
+          if @current_admin.is_admin?
+            @follow_ups = FollowUp.all
+          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)
+              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)
+              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)
+              @follow_ups = FollowUp.where(business_id: business_ids)
+            else
+              @follow_ups = FollowUp.all
+            end
+          end
+          if params[:q].present? && params[:q][:name].present?
+            @follow_ups = @follow_ups.joins(:business).where("educode_sales_businesses.name LIKE ?", "%#{params[:q][:name]}%")
+          end
+          if params[:q].present? && params[:q][:follows_date].present?
+            date = params[:q][:follows_date].split(" - ")
+            @follow_ups = @follow_ups.where("educode_sales_follow_ups.created_at > ? AND educode_sales_follow_ups.created_at < ?", date[0], date[1])
+          end
+          if params[:q].present? && params[:q][:staff_id].present?
+            @follow_ups = @follow_ups.where(staff_id: params[:q][:staff_id])
+          end
+          if params[:q].present? && params[:q][:department].present?
+            departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:q][:department]}%").pluck(:id)
+            @follow_ups = @follow_ups.joins(business: :department).where("departments.id in (?)", departments_ids)
+          end
+          if params[:q].present? && params[:q][:area].present?
+            p = EducodeSales::Common.find(params[:q][:area]).name
+            @follow_ups = @follow_ups.joins(:business).joins("
+              JOIN departments ON educode_sales_businesses.department_id = departments.id
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+          end
+          if params[:sort].present? && params[:sort][:field]
+            @follow_ups = @follow_ups.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @follow_ups = @follow_ups.order("educode_sales_follow_ups.created_at desc")
+          end
+          @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
+        end
+    end
+    end
+
     def create
       load_business
       follow_up = @business.follow_ups.build(follow_up_params)
@@ -157,7 +214,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id, :bidded_date, :signed_date)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year)
     end
 
     def teacher_params

data/app/controllers/educode_sales/home_controller.rb

@@ -42,12 +42,28 @@ module EducodeSales
     end
 
     def sales_staff
-      common = Common.find_by(clazz: 'staff_type', name: '销售')
       @staffs = Staff
+      if params[:teacher_assist].present?
+        common = Common.find_by(clazz: 'staff_type', name: '运营')
+      else
+        common = Common.find_by(clazz: 'staff_type', name: '销售')
+      end
       if params[:q].present?
         @staffs = @staffs.joins(user: :user_extension).where("concat(lastname, firstname) like :q", q: "%#{params[:q]}%")
       end
-      @staffs = @staffs.where(is_admin: false).where.not(id: @current_admin.id).where(job_type: common.id).page(params[:page]).per(10)
+      if params[:teacher_assist].present?
+        @staffs = @staffs.where(is_admin: false).where(job_type: common.id).page(params[:page]).per(10)
+      else
+        @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 sales_place
+      @places = EducodeSales::Place
+      if params[:q].present?
+        @places = @places.where("name like :q", q: "%#{params[:q].strip}%")
+      end
+      @places = @places.page(params[:page]).per(10)
     end
 
   end

data/app/controllers/educode_sales/roles_controller.rb

@@ -16,7 +16,7 @@ module EducodeSales
 
     def create
       role = Role.new(name: params[:name])
-      role.role_areas.build([{ clazz: 'Business' }, { clazz: 'SalePlan' }, { clazz: 'Teacher' }, { clazz: 'Operation' }])
+      role.role_areas.build([{ clazz: 'Business' }, { clazz: 'SalePlan' }, { clazz: 'Teacher' }, { clazz: 'Operation' }, {clazz:'Customer'}])
       if role.save
         render_success
       else
@@ -78,6 +78,9 @@ module EducodeSales
       role.role_areas.find_by(clazz: 'Operation').update(level: params[:operation])
       role.role_areas.find_by(clazz: 'SalePlan').update(level: params[:sale_plan])
       role.role_areas.find_by(clazz: 'Teacher').update(level: params[:teacher])
+      r = role.role_areas.find_or_initialize_by(clazz: 'Customer')
+      r.level = params[:customer]
+      r.save
       render_success
     end
 

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -43,7 +43,7 @@ module EducodeSales
       @follow_count_data = week_follow_count_chart(default_dates,names,x_business_ids,colors)
       if params[:follow_count_range].present?
         case params[:follow_count_range]
-        when "week"  #按周
+        when "week"   #按周
           if params[:date_week].present?
             date = params[:date_week].split(" - ")
             dates = (date[0].to_date..date[1].to_date).map { |d|
@@ -76,7 +76,6 @@ module EducodeSales
       # 已中标图表
       goal_default_dates = ("#{Time.now.year}-01".."#{Time.now.year}-#{Time.now.month}").to_a
       sale_names = ['已中标','已签单','已回款']
-      10.times{p count_type}
        @goal_count_data = month_sale_chart(goal_default_dates,sale_names,colors,x,stage_ids,s_stage_ids,count_type)
       if params[:goal_count_range].present?
         case params[:goal_count_range]
@@ -121,7 +120,7 @@ module EducodeSales
         labels: dates,
         datasets:names.map.with_index do |name,i|
           {
-            hidden: i < 3 ? false : true,
+            # hidden: i < 3 ? false : true,
             label: name[0],
             data: dates.map{ |d| @follow_up = FollowUp.where(staff_id: name[1], created_at: d.beginning_of_day..d.end_of_day).where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
@@ -135,21 +134,32 @@ module EducodeSales
     end
     def week_follow_count_chart(dates,names,x_business_ids,colors)
       {
-        labels: dates,
+        labels: dates.map{ |date|
+          d = date.split("-")
+          year = d[0].to_i
+          week = d[1].to_i
+          if week == 0
+            0
+          else
+            month = Date.commercial(year,week).strftime("%m月%d日")
+            day = Date.commercial(year,week,7).strftime("%m月%d日")
+            date.to_s + "(#{month}-#{day})"
+          end
+        } - [0],
         datasets:names.map.with_index do |name,i|
           {
-            hidden: i < 3 ? false : true,
+            # hidden: i < 3 ? false : true,
             label: name[0],
             data: dates.map{ |d|
               d = d.split("-")
               year = d[0].to_i
               week = d[1].to_i
                if week == 0
-                 @follow_up = 0
+                 @follow_up = 999999
                else
                  @follow_up = FollowUp.where(staff_id: name[1]).where("created_at >= ? AND created_at <= ?", Date.commercial(year,week).strftime("%Y-%m-%d"), Date.commercial(year,week,7).strftime("%Y-%m-%d")).where.not(business: x_business_ids).count
                end
-               },
+               } - [999999],
             backgroundColor: "#fff",
             pointBorderColor: colors[i%15+1],
             borderColor: colors[i%15+1],
@@ -164,7 +174,7 @@ module EducodeSales
         labels: dates,
         datasets:names.map.with_index do |name,i|
           {
-            hidden: i < 3 ? false : true,
+            # hidden: i < 3 ? false : true,
             label: name[0],
             data: dates.map { |d| @follow_up = FollowUp.where( staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01", "#{d}-31").where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
@@ -181,7 +191,7 @@ module EducodeSales
         labels: dates,
         datasets:names.map.with_index do |name,i|
           {
-            hidden: i < 3 ? false : true,
+            # hidden: i < 3 ? false : true,
             label: name[0],
             data: dates.map { |d| @follow_up = FollowUp.where( staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01-01", "#{d}-12-31").where.not(business: x_business_ids).count },
             backgroundColor: "#fff",

data/app/controllers/educode_sales/sales_controller.rb

@@ -9,8 +9,11 @@ module EducodeSales
       authorize! :sales, Staff
       respond_to do |format|
         format.html do
+          @year = params[:year] ? params[:year] : "全部"
+          @years = ["全部"]+(2015..Time.now.year).to_a.reverse
         end
         format.json do
+          @year = params[:year] ? params[:year] : "全部"
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           @a_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name)
           @b_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name)

data/app/controllers/educode_sales/teachers_controller.rb

@@ -21,6 +21,8 @@ module EducodeSales
     def index
       respond_to do |format|
         format.html do
+          common = Common.find_by(clazz: 'staff_type', name: '运营')
+          @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
           @more = can?(:create, EducodeSales::OperationPlan) || can?(:update, EducodeSales::Teacher) || can?(:destroy, EducodeSales::Teacher)
           gon.menus = []
           if can?(:create, EducodeSales::OperationPlan)
@@ -43,14 +45,30 @@ module EducodeSales
             when '自己'
               @teachers = Teacher.where(is_key: false)
               @teachers = @teachers.where(staff_id: @current_admin.id)
+              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)
               @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)
             else
               @teachers = Teacher.where(is_key: false)
             end
           end
-          
+
+          if @current_admin.job_type == Common.find_by(clazz: 'staff_type', name: '销售').id
+            public_teacher_ids = EducodeSales::Teacher.where(staff_id: 0).pluck(:id) - EducodeSales::TeacherAssignFollow.where(staff_id: @current_admin.id).pluck(:teacher_id)
+            @teachers = @teachers.where.not(id: public_teacher_ids)
+          end
+
+
+
+          if params[:q].present? && params[:q][:assist].present?
+            staff_id = params[:q][:assist].to_i
+            teacher_ids = EducodeSales::TeacherAssignFollow.where(staff_id: staff_id).pluck(:teacher_id)
+            @teachers = @teachers.where(id: teacher_ids)
+          end
           if params[:q].present? && params[:q][:name].present?
             @teachers = @teachers.where("educode_sales_teachers.name like ?", "%#{params[:q][:name]}%")
           end
@@ -60,6 +78,13 @@ module EducodeSales
           if params[:q].present? && params[:q][:regist_at].present?
             @teachers = @teachers.where("educode_sales_teachers.regist_at like ?", "%#{params[:q][:regist_at]}%")
           end
+          if params[:q].present? && params[:q][:status].present?
+            if params[:q][:status] == "1"
+              @teachers = @teachers.where("educode_sales_teachers.user_id is not null")
+            else
+              @teachers = @teachers.where("educode_sales_teachers.user_id is null")
+            end
+          end
           if params[:q].present? && params[:q][:attitude].present?
             # @teachers = @teachers.where("educode_sales_teachers.attitude_id = ?", "#{params[:q][:attitude]}")
             @teachers = @teachers.joins("
@@ -105,6 +130,9 @@ module EducodeSales
     def create
       department = Department.find(params[:department_id])
       teacher = @current_admin.teachers.build(teacher_params)
+      params[:teacher_assist].each do |d|
+        teacher.teacher_assign_follows.build(staff_id: d)
+      end
       teacher.department_id = department.id
       if params[:user_id].present?
         user = User.find(params[:user_id])
@@ -147,6 +175,13 @@ module EducodeSales
       teacher = Teacher.find(params[:id])
       teacher.department_id = department.id
       teacher.assign_attributes(teacher_params)
+
+      teacher_assists = []
+      params[:teacher_assist].each do |d|
+        teacher_assists << teacher.teacher_assign_follows.find_or_initialize_by(staff_id: d)
+      end
+      teacher.teacher_assign_follows = teacher_assists
+      
       if params[:user_id].present?
         user = User.find(params[:user_id])
         teacher.user_id = user.id
@@ -171,7 +206,10 @@ module EducodeSales
     end
 
     def edit
-      @teacher = Teacher.find(params[:id])
+      load_teacher
+      gon.teacher_assist = @teacher.teacher_assign_follows.map do |d|
+        {value: d.staff_id, name: d.staff.user.full_name}
+      end
       gon.department = { value: @teacher.department_id, name: "#{@teacher.department&.school&.name}-#{@teacher.department&.name}" }
       gon.value = @teacher.department_id
       render layout: false
@@ -256,17 +294,6 @@ module EducodeSales
       render layout: false
     end
 
-    # def create_follow_record
-    #
-    # end
-    #
-    # def update_follow_record
-    #
-    # end
-    # def delete_follow_record
-    #
-    # end
-
     def show_follow_record
       @follow_up = TeacherFollow.find(params[:id])
       render layout: false
@@ -294,7 +321,7 @@ module EducodeSales
 
     private
     def teacher_params
-      params.permit(:name, :professional_title, :job, :source_id)
+      params.permit(:name, :professional_title, :job, :source_id, :wechat)
     end
 
     def load_teacher

data/app/models/educode_sales/customer.rb

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