educode_sales 0.9.67 → 0.9.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5df645421c2aa112db563a37427dc4371924632bbca76efa21b74acec0911793
-  data.tar.gz: bcc515a472ec5c92f66b9bb833dcfe4ca4e2330634df6bfb0b9b058501a90f90
+  metadata.gz: 68edf1ae34edbb71f7c415a1bf1f298683c507681463630bbe54cd9e008a1d18
+  data.tar.gz: f7dc04cdeab6ff2fe4e696265e5175abd99095dda76fd8dbba2263afa103190e
 SHA512:
-  metadata.gz: ee2b4439e08af8c4ca6810fc5fe5ef04d0d410c38a6bc32c8ca3bdcc0caea46e1ce3ac29b178c2c632f5edddd5190046f47e00605a1c33496e7e7a4c9aeb7c89
-  data.tar.gz: 41c923fe3dd2dd68df2c141add67467fd52b1ffc5bc5ac36a010272cb38b75d1cab760f6e136b24d32c22642dee5f19f84da10c279d9b22d12eb728e4b66d4e9
+  metadata.gz: 2fed0873dcabcf99b57d6713f2df0e59efc030ffbc27b23e7cacd02e05e81d42db0e3e571663a3230ee43a3885bcc5f3833f0cf3ed601f1a7136f62ace3a3833
+  data.tar.gz: 653629bfc15b4d1ad604462f17b61ddf9512e26d9cc0f806177b8048d2f665ec1ff28d2c33191ed9ef1c7167db9ee895c70239493d45bf03dddae4cfbf426eaf

data/app/controllers/educode_sales/activities_controller.rb

@@ -5,13 +5,17 @@ module EducodeSales
     def index
       respond_to do |format|
         format.html do
-         @staffs = Staff.all.map { |d| [ d.user&.real_name, d.id ]}
+        common = Common.find_by(clazz: 'staff_type', name: '销售')
+        @staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11).map { |d| [d.user.real_name, d.id]}
+
+        role = EducodeSales::Role.find_by(name: '生态经理')
+        @staff_manage = Staff.joins(:user).where(role_id: role.id).map { |d| [d.user.real_name, d.id]}
         end
         format.json do
           @activities = Activity
           if params[:q].present?
             if params[:q][:staff_id].present?
-              @activities = @activities.where(staff_id: params[:q][:staff_id])
+              @activities = @activities.where(sales_id: params[:q][:staff_id])
             end
             if params[:q][:clazz_id].present?
               @activities = @activities.where(clazz_id: params[:q][:clazz_id])
@@ -56,8 +60,7 @@ module EducodeSales
       manage_ids = @activity.manages.pluck(:staff_id)
       assist_ids = @activity.assists.pluck(:staff_id)
       gon.staff_manage = Staff.all.map { |d| {name: d.user&.real_name, value: d.id, selected: manage_ids.include?(d.id)}}
-      gon.assists = Staff.all.map { |d| {name: d.user&.real_name, value: d.id, selected: assist_ids.include?(d.id)}}
-      gon.experts = @activity.experts.map { |d| {name: d.name, value: d.user_id || d.name, selected: true}}
+      gon.assistss = @activity.assists.map { |d| {name: d.name, value: d.user_id || d.name, selected: true}}
 
       gon.invitation_list = @activity.invitations.map { |d| {name: d.name, value: d.user_id || d.name, selected: true}}
 
@@ -74,15 +77,13 @@ module EducodeSales
         params[:staff_manage_id].each do |d|
           EducodeSales::ActivityStaff.create(staff_id: d, clazz_id: 'manage', activity_id: activity.id)
         end
+    
         params[:staff_assist_id].each do |d|
-          EducodeSales::ActivityStaff.create(staff_id: d, clazz_id: 'assist', activity_id: activity.id)
-        end
-        params[:expert_ids].each do |d|
           if d[0].to_i > 0
             u = User.find(d[0].to_i)
-            EducodeSales::ActivityStaff.create(name: u.real_name, clazz_id: 'expert', user_id: d[0].to_i, activity_id: activity.id)
+            EducodeSales::ActivityStaff.create(name: u.real_name, clazz_id: 'assist', user_id: d[0].to_i, activity_id: activity.id)
           else
-            EducodeSales::ActivityStaff.create(name: d[1], clazz_id: 'expert', activity_id: activity.id)
+            EducodeSales::ActivityStaff.create(name: d[1], clazz_id: 'assist', activity_id: activity.id)
           end
         end
         params[:invitation_ids].each do |d|
@@ -93,11 +94,6 @@ module EducodeSales
             EducodeSales::ActivityStaff.create(name: d[1], clazz_id: 'invitation', activity_id: activity.id)
           end
         end
-        if params[:attachment_id].present?
-          attachment = @current_admin.user.attachments.find(params[:attachment_id])
-          attachment.container = activity
-          attachment.save
-        end
         render_success
       else
         render_failure activity
@@ -119,7 +115,6 @@ module EducodeSales
         sales_id: params[:sales_id] || @current_admin.id
        )
       manages = []
-      experts = []
       assists = []
       invitations = []
       params[:staff_manage_id].each do |d|
@@ -127,14 +122,11 @@ module EducodeSales
       end
    
       params[:staff_assist_id].each do |d|
-        assists << EducodeSales::ActivityStaff.find_or_initialize_by(staff_id: d, clazz_id: 'assist', activity_id: activity.id)
-      end
-      params[:expert_ids].each do |d|
         if d[0].to_i > 0
           u = User.find(d[0].to_i)
-          experts << EducodeSales::ActivityStaff.find_or_initialize_by(name: u.real_name, clazz_id: 'expert', user_id: d[0].to_i, activity_id: activity.id)
+          assists << EducodeSales::ActivityStaff.find_or_initialize_by(name: u.real_name, clazz_id: 'assist', user_id: d[0].to_i, activity_id: activity.id)
         else
-          experts << EducodeSales::ActivityStaff.find_or_initialize_by(name: d[1], clazz_id: 'expert', activity_id: activity.id)
+          assists << EducodeSales::ActivityStaff.find_or_initialize_by(name: d[1], clazz_id: 'assist', activity_id: activity.id)
         end
       end
       params[:invitation_ids].each do |d|
@@ -147,25 +139,8 @@ module EducodeSales
       end
       activity.manages = manages
       activity.assists = assists
-      activity.experts = experts
       activity.invitations = invitations
-
-      if params[:attachment_id].present?
-        if activity.attachment&.id && activity.attachment&.id != params[:attachment_id].to_i
-          file_path = File.join(Rails.root, "public", "files", 'educode_sales', activity.attachment.disk_filename)
-          File.delete(file_path) if File.exist?(file_path)
-          activity.attachment.destroy
-        end
-        attachment = @current_admin.user.attachments.find(params[:attachment_id])
-        attachment.container = activity
-        attachment.save
-      else
-        if activity.attachment
-          file_path = File.join(Rails.root, "public", "files", 'educode_sales', activity.attachment.disk_filename)
-          File.delete(file_path) if File.exist?(file_path)
-          activity.attachment.destroy
-        end
-      end
+      
       if activity.save
         render_success
       else
@@ -190,6 +165,10 @@ module EducodeSales
       render layout: false
     end
 
+    def upload_file
+      render layout: false
+    end
+
     def show_schools
       respond_to do |format|
         format.html do
@@ -231,6 +210,41 @@ module EducodeSales
       @data = @data.distinct.page(params[:page]).per(params[:limit])
     end
 
+    def update_advise
+      activity = Activity.find(params[:id])
+      if activity.last_follow_up
+        activity.last_follow_up.update(advise: params[:content])
+        render_success
+      else
+        render_failure '无跟进动态，暂不能添加建议'
+      end
+    end
+
+    def add_advise
+      followup = ActivityFollowUp.find(params[:id])
+      followup.update(advise: params[:content])
+      render_success
+    end
+
+
+    def files
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+          activity = Activity.find(params[:id])
+          @files = activity.attachments
+          if params[:sort].present? && params[:sort][:field]
+            @files = @files.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @files = @files.order("created_on desc")
+          end
+          @files = @files.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
     private
 
     def activity_params

data/app/controllers/educode_sales/businesses_controller.rb

@@ -395,7 +395,7 @@ module EducodeSales
 
       gon.levels = EducodeSales::BusinessLevel.level_ids.keys.map { |d| {name: d, value: d, selected: levels.include?(d)}}
       gon.watche_ids = Staff.all.map { |d| {name: d.user&.real_name, value: d.id, selected: staff_ids.include?(d.id)}}
-      gon.department = {value: @business.department_id, name: "#{@business.department.school.name}-#{@business.department.name}"}
+      gon.department = {value: @business.department_id, name: "#{@business.department&.school&.name}-#{@business.department&.name}"}
       gon.value = @business.department_id
       render layout: false
     end

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -72,11 +72,15 @@ module EducodeSales
     def create
       plan = @current_admin.operation_plans.build(plan_params)
       plan.month = params["month"] + "-1"
-      plan.teacher_id = @current_admin.teachers.find(params[:teacher_id]).id
-      if plan.save
-        render_success
+      if (Integer(params[:teacher_id]) rescue nil)
+        plan.teacher_id = @current_admin.teachers.find(params[:teacher_id]).id
+        if plan.save
+          render_success
+        else
+          render_failure plan
+        end
       else
-        render_failure plan
+        render_failure '不存在该教师'
       end
     end
 

data/app/controllers/educode_sales/plans_controller.rb

@@ -29,9 +29,9 @@ module EducodeSales
             end
           end
           if params[:clazz] == 'week'
-            @sale_plans = @sale_plans.where.not(weekly: nil)
-          else
-            @sale_plans = @sale_plans.where(weekly: nil)
+            @sale_plans = @sale_plans.where.not(weekly: nil).where.not(month: nil)
+          elsif params[:clazz] == 'month'
+            @sale_plans = @sale_plans.where(weekly: nil).where.not(month: nil)
           end
           if params[:q].present? && params[:q][:staff_id].present?
             @sale_plans = @sale_plans.where(staff_id: params[:q][:staff_id])
@@ -59,13 +59,34 @@ module EducodeSales
     end
 
     def create
-      plan = @current_admin.sale_plans.build(plan_params)
-      plan.month = params["month"] + "-1"
-      plan.business = Business.find_by(id: params[:business_id])
-      if plan.save
+      if params["year"].present?
+        business = Business.find_by(id: params[:business_id])
+        plan = @current_admin.sale_plans.build(year: params[:year], business_id: business.id, clazz: params[:clazz])
+        if plan.save
+          render_success
+        else
+          render_failure plan
+        end
+      else
+        plan = @current_admin.sale_plans.build(plan_params)
+        plan.month = params["month"] + "-1"
+        plan.business = Business.find_by(id: params[:business_id])
+        if plan.save
+          render_success
+        else
+          render_failure plan
+        end
+      end
+      
+    end
+
+    def create_business_info
+      business = Business.find_by(id: params[:business_id])
+      info = @current_admin.business_infos.build(year: params[:year], business_id: business.id, clazz: params[:clazz])
+      if info.save
         render_success
       else
-        render_failure plan
+        render_failure info
       end
     end
 
@@ -115,6 +136,14 @@ module EducodeSales
       render layout: false
     end
 
+    def new_year
+      business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
+      @businesses =Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
+      @clazz = EducodeSales::SalePlan::CLAZZ_NAME
+      render layout: false
+    end
+
     def new_monthly
       d = @current_admin
       area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
@@ -196,11 +225,21 @@ module EducodeSales
     end
 
     def destroy
-      sale_plan = SalePlan.find(params[:id])
-      if sale_plan.soft_destroy(@current_admin.id)
+      if params[:year].present?
+        # 删除年度计划
+        sale_plans = SalePlan.where(year: params[:year], clazz: EducodeSales::SalePlan::CLAZZ_NAME[params[:clazz]])
+        sale_plans.each do |d|
+          EducodeSales::Recycle.create(source: d, deleter_id: @current_admin.id)
+        end
+        sale_plans.update_all(deleted_at: Time.now)
         render_success
       else
-        render_failure sale_plan
+        sale_plan = SalePlan.find(params[:id])
+        if sale_plan.soft_destroy(@current_admin.id)
+          render_success
+        else
+          render_failure sale_plan
+        end
       end
     end
 
@@ -242,11 +281,134 @@ module EducodeSales
       @sale_plans =  @sale_plans.page(params[:page]).per(params[:limit])
     end
 
+    def years_plan
+      if @current_admin.is_admin?
+        @sale_plans = SalePlan
+      else
+        level = @current_admin.role.role_areas.find_by(clazz: '销售计划').level
+        case level
+        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)
+          business_ids = Business.where(school_id: StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)).pluck(:id)
+          @sale_plans = SalePlan.where("educode_sales_sale_plans.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
+      end
+      @sale_plans = @sale_plans.where.not(year: nil)
+      @sale_plans = @sale_plans.select("SUM(last_follow.budget_amount) AS budget_amounts, educode_sales_sale_plans.*, ss.annual")
+      @sale_plans = @sale_plans.joins("
+        JOIN educode_sales_businesses ON educode_sales_businesses.id = educode_sales_sale_plans.business_id
+        LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id AND last_follow.deleted_at IS NULL
+        LEFT JOIN educode_sales_assessments_settings AS ss ON ss.staff_id = educode_sales_sale_plans.staff_id
+            AND YEAR(ss.assessment_year) = educode_sales_sale_plans.year AND ss.assessment = educode_sales_sale_plans.clazz")
+
+      @sale_plans = @sale_plans.group("educode_sales_sale_plans.staff_id, clazz, year")
+
+      @sale_plans = @sale_plans.where(deleted_at: nil)
+
+      if params[:q].present? && params[:q][:year].present?
+        @sale_plans = @sale_plans.where(year: params[:q][:year])
+      end
+      if params[:q].present? && params[:q][:staff_id].present?
+        @sale_plans = @sale_plans.where(staff_id: params[:q][:staff_id])
+      end
+      if params[:sort].present? && params[:sort][:field]
+        @sale_plans = @sale_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+      else
+        @sale_plans = @sale_plans.order("created_at desc")
+      end
+
+      @sale_plans = @sale_plans.page(params[:page]).per(params[:limit])
+    end
+
+    def my_years_plan
+      @sale_plans = SalePlan.where(staff_id: @current_admin.id)
+    end
+
+    def business_infos
+      @data = @current_admin.business_infos.where(sale_plan_id: nil, year: params[:year])
+
+      if params[:sort].present? && params[:sort][:field]
+        @data = @data.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+      else
+        @data = @data.order("created_at desc")
+      end
+      @data = @data.page(params[:page]).per(params[:limit])
+    end
+
+    def edit_bussiness_info
+      @business_info = @current_admin.business_infos.find(params[:id])
+      render layout: false
+    end
+
+    def edit_bussiness_info_extra
+      @business_info = @current_admin.business_infos.find(params[:id])
+      render layout: false
+    end
+
+    def plan_business_infos
+      @data = @current_admin.business_infos.where(year: params[:year])
+
+      if params[:sort].present? && params[:sort][:field]
+        @data = @data.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+      else
+        @data = @data.order("created_at desc")
+      end
+      @data = @data.page(params[:page]).per(params[:limit])
+    end
+
+    def update_business_info
+      business_info = @current_admin.business_infos.find(params[:id])
+      if business_info.update(business_info_params)
+        render_success
+      else
+        render_failure business_info
+      end
+    end
+
+    def update_business_info_extra
+      business_info = @current_admin.business_infos.find(params[:id])
+      if business_info.update(update_business_info_extra_params)
+        render_success
+      else
+        render_failure business_info
+      end
+    end
+
+    def create_sales_plan
+      @current_admin.business_infos.where(sale_plan_id: nil).each do |d|
+        plan = @current_admin.sale_plans.create(year: d.year, business_id: d.business_id, clazz: d.clazz)
+        d.update(sale_plan_id: plan.id)
+      end
+      render_success
+    end
+
+    def delete_business_info
+      @current_admin.business_infos.where(id: params[:id]).destroy_all
+      render_success
+    end
+
+    def edit_year_plan
+      render layout: false
+    end
+
     private
 
     def plan_params
       params.permit(:month, :weekly, :content, :finish_rate, :business_id)
     end
 
+    def business_info_params
+      params.permit(:plan_bid_on, :plan_sign_on, :prepayment_plan_on, :prepayment_amount)
+    end
+
+    def update_business_info_extra_params
+      params.permit(:plan_bid_on, :actual_bidded_on, :bidded_amount, :plan_sign_on, :actual_sign_on, :sign_amount, :plan_deploy_on, :actual_deploy_on, :plan_check_on,
+       :actual_check_on, :prepayment_plan_on, :prepayment_actual_on, :prepayment_amount, :check_fee_plan_on, :check_fee_actual_on, :check_fee, :qa_plan_on, :qa_actual_on, :qa_amount, :account_receivable)
+    end
+
   end
 end

data/app/controllers/educode_sales/recycles_controller.rb

@@ -83,7 +83,7 @@ module EducodeSales
     end
 
     def monthPlan
-      @monthPlans = Recycle.where(source_type:"EducodeSales::SalePlan")
+      @monthPlans = Recycle.joins("JOIN educode_sales_sale_plans ON educode_sales_sale_plans.id = educode_sales_recycles.source_id AND educode_sales_sale_plans.month IS NOT NULL AND educode_sales_sale_plans.weekly IS NULL").where(source_type:"EducodeSales::SalePlan")
       if params[:sort].present? && params[:sort][:field]
         @monthPlans = @monthPlans.order("created_at #{params[:sort][:order]}")
       else
@@ -91,5 +91,15 @@ module EducodeSales
       end
       @monthPlans = @monthPlans.page(params[:page]).per(params[:limit])
     end
+
+    def yearPlan
+      @plans = Recycle.joins("JOIN educode_sales_sale_plans ON educode_sales_sale_plans.id = educode_sales_recycles.source_id AND educode_sales_sale_plans.year IS NOT NULL").where(source_type:"EducodeSales::SalePlan")
+      if params[:sort].present? && params[:sort][:field]
+        @plans = @plans.order("created_at #{params[:sort][:order]}")
+      else
+        @plans = @plans.order("educode_sales_recycles.created_at desc")
+      end
+      @plans = @plans.page(params[:page]).per(params[:limit])
+    end
 end
 end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -51,22 +51,22 @@ module EducodeSales
           end if role
           
           if @current_admin.is_admin?
-            @teachers = Teacher.where(is_key: false)
+            @teachers = Teacher
           else
             level = @current_admin.role.role_areas.find_by(clazz: '教师运营').level
             case level
             when '自己'
-              @teachers = Teacher.where(is_key: false)
+              @teachers = Teacher
               @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) + 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)
+              @teachers = Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").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)
+              @teachers = Teacher
             end
           end
 

data/app/controllers/educode_sales/upload_files_controller.rb

@@ -33,13 +33,20 @@ module EducodeSales
       if @attachment.blank?
         @attachment = Attachment.new
         @attachment.filename = upload_file.original_filename
-        @attachment.description = "business"
+        if params[:activity_id].present?
+          @attachment.container_id = params[:activity_id]
+          @attachment.container_type = 'EducodeSales::Activity'
+        else
+          @attachment.description = "business"
+          @attachment.container_id = params[:business_id]
+        end
+        
         @attachment.disk_filename = local_path[save_path.size + 1, local_path.size]
         @attachment.filesize = upload_file.tempfile.size
         @attachment.content_type = content_type
         @attachment.digest = digest
         @attachment.author_id = @current_admin.user_id
-        @attachment.container_id = params[:business_id]
+      
         @attachment.save!
       else
         logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"

data/app/models/educode_sales/activity.rb

@@ -11,6 +11,10 @@ module EducodeSales
     has_many :activity_staffs, dependent: :destroy
     has_many :activity_follow_ups, dependent: :destroy
 
+    has_many :attachments, as: :container, dependent: :destroy
+
+    belongs_to :last_follow_up, class_name: 'ActivityFollowUp', optional: true 
+
     belongs_to :sales, class_name: 'Staff', optional: true
 
     has_one :attachment, as: :container, dependent: :destroy

data/app/models/educode_sales/assessments_setting.rb

@@ -8,7 +8,7 @@ module EducodeSales
 
 
     CLAZZ = {
-             7 => '销售指标', 1 => '签单指标', 2 => '回款指标', 3 => '商机跟进', 4 => '商机挖掘-A类商机', 5 => '商机挖掘-B类商机', 6 => '客户拜访-线下拜访', 8 => '客户拜访-线上拜访',
+             7 => '商机目标',  18 => '中标目标', 1 => '签单目标', 2 => '回款目标', 3 => '商机跟进', 4 => '商机挖掘-A类商机', 5 => '商机挖掘-B类商机', 6 => '客户拜访-线下拜访', 8 => '客户拜访-线上拜访',
              9 => '注册数据-学生', 10 => '注册数据-老师', 11 => '会议组织-区域性会议', 12 => '会议组织-单校会议', 13 => '生态合作-虚拟教研室', 14 => '生态合作-特软', 15 => '生态合作-大V合作',
              16 => '重要事项', 17 => '临时任务'
             }
@@ -17,7 +17,7 @@ module EducodeSales
 
     def unit_name
       case self.assessment
-      when 1, 2, 7
+      when 1, 2, 7, 18
         '万元'
       when 3
         '条'

data/app/models/educode_sales/business_info.rb

@@ -0,0 +1,9 @@
+module EducodeSales
+  class BusinessInfo < ApplicationRecord
+    belongs_to :staff
+    belongs_to :business
+    belongs_to :sale_plan, optional: true
+  end
+
+end
+  

data/app/models/educode_sales/sale_plan.rb

@@ -5,7 +5,9 @@ module EducodeSales
     belongs_to :staff
     validates :business_id, presence: true
 
-    validates :month, presence: true
+    # validates :month, presence: true
+
+    CLAZZ_NAME = {'商机目标' => 7, '中标目标' => 18, '签单目标' => 1, '回款目标' => 2}
 
     default_scope  -> {where(deleted_at: nil)}
   end

data/app/models/educode_sales/staff.rb

@@ -25,6 +25,8 @@ module EducodeSales
 
     has_many :staff_school_tags, dependent: :destroy
 
+    has_many :business_infos, dependent: :destroy
+
     has_many :market_areas, dependent: :destroy
     has_many :areas, through: :market_areas
     validates :user_id, uniqueness: { message: '已存在' }