educode_sales 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f22bc4c0ef5a0ae9badb57ed14a6ea2d06f3ebb757746eb2b865cc1d9295c7f
-  data.tar.gz: 9a1d107c5a64574e40693890012cba94d9eb3593325db8723320dfbe56a3957b
+  metadata.gz: b46afaa19173f871423665f95aafafb3443518ad51810efb33b76d6d00d4c162
+  data.tar.gz: 43aa8f04c71a2ab4d9dc0cdcbc75f2171ab3f27b30c3732d0ffaacf6d1cf4503
 SHA512:
-  metadata.gz: 7b67e1c0d5edc38a48f8e9dcebfac180fe01d4546cdf23cb98aeda429835de1e68221071fb62af3d30622101ddc3f64cec9d88a7c879a90642ba0e5d30faf466
-  data.tar.gz: e062d9eee3c4c6ceae7ffcea260dc8b4f2d107b74afbd67f68e440a7adc22031b48c21f24f7e25fa74339c931c55386b2e0bdbfa92a408225e2d1d4021690f02
+  metadata.gz: e2eeb2350a2fe54a6f4e01cfc40369538ba69dea82e74a5f95543e188b313975f5a7021cdc7da84d27a83993bda4161fc184a07f53eed4ae9f608c8f89b8bbd3
+  data.tar.gz: 0604716ff8a63448d01c579f4321e3e7699429f35b9dfec7d0f5c291dec9aca57e4abb5b8ffc16d4b9f2a5931f3c01d63f1f0dcba5362459eb8cd1da444f1997

data/app/controllers/educode_sales/businesses_controller.rb

@@ -384,7 +384,7 @@ module EducodeSales
     end
 
     def daily_paper
-      @followups = EducodeSales::FollowUp.where(staff_id: @current_admin.id).where("updated_at > ?", Time.now.beginning_of_day).order("updated_at")
+      @followups = EducodeSales::FollowUp.where(staff_id: @current_admin.id).where("created_at > ?", Time.now.beginning_of_day).order("created_at")
       ab = EducodeSales::Common.where(extras: [EducodeSales::Common::ATYPE, EducodeSales::Common::BTYPE]).pluck(:id)
       business = EducodeSales::FollowUp.joins("
         JOIN educode_sales_businesses ON educode_sales_businesses.id = educode_sales_follow_ups.business_id
@@ -484,6 +484,9 @@ module EducodeSales
           params[:sourcable_id] = ""
         end
       end
+      if ['会议活动', '渠道代理', '客户'].include?(params[:source_way] ) && params[:sourcable_id].blank?
+        params[:sourcable_type] = ""
+      end
       if params[:sourcable_type].blank?
         params[:sourcable_id] = ""
       end

data/app/controllers/educode_sales/contracts_controller.rb

@@ -364,8 +364,24 @@ module EducodeSales
       end
       follow_up.staff = @current_admin
 
+      last_follow_up.assign_follow_ups.each do |d|
+        follow_up.assign_follow_ups.build(staff_id: d.staff_id)
+      end
+
       if follow_up.save!
-        last_follow_up.assign_follow_ups.update_all(follow_up_id: follow_up.id)
+        if last_follow_up.present?
+          last_follow_up.key_person.each do |d|
+            key_person = d.dup
+            key_person.follow_up_id = follow_up.id
+            key_person.save
+          end
+          last_follow_up.money_plans.each do |d|
+            money = d.dup
+            money.staff = @current_admin
+            money.follow_up_id = follow_up.id
+            money.save
+          end
+        end
 
         contract_lists = EducodeSales::ContractDateList.clazzs.invert
         data.each_with_index do |s, i|

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -234,22 +234,23 @@ module EducodeSales
         # 从教师列表里选择的用户
         teacher = Teacher.find(names[1])
         key_peprson = KeyPerson.new(teacher_params)
+        key_peprson.name = teacher.name
         key_peprson.teacher = teacher
-      else
+      elsif names[0] == 'u'
         # 从头歌平台选择的用户
         user = User.find(names[1])
-        teacher = Teacher.new(staff: @current_admin,
-          professional_title: params[:professional_title],
-          job: params[:job],
-          user_id: user.id,
-          is_key: true,
-          department_id: user.department_id,
-          name: user.real_name
-        )
+        key_peprson = KeyPerson.new(teacher_params)
+        teacher = EducodeSales::Teacher.find_or_initialize_by(name: user.real_name, department_id: user.department_id, user_id: user.id)
+        
+        teacher.staff = @current_admin
+        teacher.professional_title = params[:professional_title]
+        teacher.job = params[:job]
+        teacher.is_key = true
         teacher.save
+        key_peprson.name = teacher.name
+        key_peprson.teacher_id = teacher.id
+      else
         key_peprson = KeyPerson.new(teacher_params)
-        teacher_id = EducodeSales::Teacher.find_by(name: user.real_name, department_id: user.department_id).id
-        key_peprson.teacher_id = teacher_id
       end
 
       follow_up.key_person << key_peprson
@@ -318,7 +319,7 @@ module EducodeSales
     end
 
     def teacher_params
-      params.permit(:professional_title, :job, :attitude_id, :sex, :birth_date, :remark, :tel)
+      params.permit(:professional_title, :job, :attitude_id, :sex, :birth_date, :remark, :tel, :name)
     end
   end
 end

data/app/controllers/educode_sales/home_controller.rb

@@ -77,6 +77,13 @@ module EducodeSales
       end
     end
 
+    def search_contracts
+      @data = Business
+      if params[:q].present?
+        @data = @data.where("name like :q ", q: "%#{params[:q]}%").limit(20)
+      end
+    end
+
     def staff_departments
       @departments = Department.where(school_id: params[:school_id])
       if params[:q].present?
@@ -111,5 +118,12 @@ module EducodeSales
       end
     end
 
+    def search_money_plans
+      @data = MoneyPlan.joins(business: :school)
+      if params[:q].present?
+        @data = @data.where("educode_sales_businesses.name like :q OR educode_sales_businesses.number like :q OR schools.name like :q ", q: "%#{params[:q]}%").limit(20)
+      end
+    end
+
   end
 end

data/app/controllers/educode_sales/invoices_controller.rb

@@ -0,0 +1,219 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class InvoicesController < ApplicationController
+
+    def index
+    end
+
+    def apply
+      render layout: false
+    end
+
+    def create_apply
+      business = Business.find(params[:business_id])
+      count = EducodeSales::InvoiceApply.where("created_at > ?", Time.now.beginning_of_day).size + 1
+      invoice_apply = InvoiceApply.find_or_initialize_by(business_id: business.id) do |d|
+        d.number = Time.now.strftime("%y%m%d").gsub("-", "") + rand(10..99).to_s + ("%04d" % count)
+        d.state = '审核中'
+      end
+      invoice_apply.staff = @current_admin
+      invoice_apply.assign_attributes(apply_params)
+      ActiveRecord::Base.transaction do
+        invoice_apply.save!
+        params[:details].each do |d|
+          detail = invoice_apply.invoice_details.new({
+            sale_detail_id: d['id'],
+            specification: d['specification'],
+            business_id: business.id,
+            unit: d['unit'],
+            category: d['category'],
+            state: '待开票',
+            name: d['name'],
+            num: d['num'],
+            price: d['price'],
+            amount: d['amount']})
+            detail.save!
+        end
+      end
+      render_success
+    end
+
+    def details
+      business = Business.find(params[:id])
+      invoice_apply = business.invoice_apply
+      if invoice_apply
+        if params[:state].present?
+          @data = invoice_apply.invoice_details.where(state: params[:state])
+        else
+          @data = invoice_apply.invoice_details
+        end
+      else
+        @data = InvoiceDetail.none
+      end
+      @data = @data.page(params[:page]).per(params[:limit])
+    end
+
+    def sales_details
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+          business = Business.find(params[:id])
+          @data = business.sales_details.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def invoice_amount
+      business = Business.find(params[:id])
+      render json: {
+        actual_amount: business&.last_follow_up&.actual_amount,
+        invoice_pass: business&.invoice_details&.sum(:amount),
+        invoice_category: business&.invoice_apply&.category || '',
+        is_tax_rebate: business&.invoice_apply&.is_tax_rebate.to_s,
+        ticket_at: business&.invoice_apply&.ticket_at || '',
+        name: business&.invoice_apply&.name || '',
+        taxpaper_number: business&.invoice_apply&.taxpaper_number || '',
+        address: business&.invoice_apply&.address || '',
+        phone: business&.invoice_apply&.phone || '',
+        bank: business&.invoice_apply&.bank || '',
+        bank_number: business&.invoice_apply&.bank_number || '',
+      }
+    end
+
+
+    def apply_records
+      respond_to do |format|
+        format.html do
+        end
+        format.js do
+          @staffs = Staff.joins(:invoice_applys).includes(:user).distinct.map { |d| [d.user.real_name, d.id]}
+        end
+        format.json do
+          @data = InvoiceApply
+
+          unless @current_admin.is_admin?
+            @data = @data.left_joins(business: [last_follow_up: :assign_follow_ups]).where("educode_sales_assign_follow_ups.staff_id = :staff OR educode_sales_invoice_applies.staff_id = :staff", staff: @current_admin.id)
+          end
+
+          if params[:q].present? && params[:q][:payer_name].present?
+            @data = @data.where("payer_name like ?", "%#{params[:q][:payer_name]}%")
+          end
+
+          if params[:q].present? && params[:q][:business].present?
+            @data = @data.joins(:business).where("educode_sales_businesses.name like ?", "%#{params[:q][:business]}%")
+          end
+
+          if params[:q].present? && params[:q][:number].present?
+            @data = @data.where("educode_sales_invoice_applies.number like ?", "%#{params[:q][:number]}%")
+          end
+
+          if params[:q].present? && params[:q][:amount].present?
+            @data = @data.where("educode_sales_invoice_applies.amount = ?", params[:q][:amount])
+          end
+
+          if params[:q].present? && params[:q][:staff_id].present?
+            @data = @data.where("educode_sales_invoice_applies.staff_id = ?", params[:q][:staff_id])
+          end
+
+          if params[:q].present? && params[:q][:created_at].present?
+            date = params[:q][:created_at].split(" - ")
+            @data = @data.where("educode_sales_invoice_applies.created_at > ? AND educode_sales_invoice_applies.created_at < ?", date[0] + " 00:00:00", date[1] + " 23:59:59")
+          end
+
+          if params[:q].present? && params[:q][:date_at].present?
+            date = params[:q][:date_at].split(" - ")
+            @data = @data.joins(:invoices).where("educode_sales_invoices.date_at > ? AND educode_sales_invoices.date_at < ?", date[0] + " 00:00:00", date[1] + " 23:59:59")
+          end
+
+          if params[:q].present? && params[:q][:school].present?
+            @data = @data.joins(business: :school).where("schools.name like ?", "%#{params[:q][:school]}%")
+          end
+
+          if params[:q].present? && params[:q][:invoice_number].present?
+            @data = @data.joins(:invoices).where("educode_sales_invoices.number like ?", "%#{params[:q][:invoice_number]}%")
+          end
+
+          if params[:q].present? && params[:q][:date_at].present?
+            date = params[:q][:date_at].split(" - ")
+            @data = @data.where("date_at BETWEEN ? AND ?", date[0], date[1])
+          end
+          if params[:q].present? && params[:q][:state].present?
+            if params[:q][:state] == '已认领'
+              @data = @data.having("claim_num > 0")
+            elsif params[:q][:state] == '待认领'
+              @data = @data.having("claim_num = 0 AND business_id IS NOT NULL")
+            elsif params[:q][:state] == '无对应合同'
+              @data = @data.having("claim_num = 0 AND business_id IS NULL")
+            end
+              
+          end
+          if params[:q].present? && params[:q][:amount].present?
+            @data = @data.where(amount: params[:q][:amount])
+          end
+
+          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
+      end
+    end
+
+    def list
+      invoice_apply = InvoiceApply.find(params[:id])
+      @data = invoice_apply.invoices
+      @data = @data.order(created_at: :desc).page(params[:page]).per(params[:limit])
+    end
+
+    def new
+      render layout: false
+    end
+
+    def create
+      invoice_apply = InvoiceApply.find(params[:invoice_apply_id])
+      invoice = invoice_apply.invoices.new(invoice_params)
+      if invoice.save
+        render_success
+      else
+        render_failure invoice
+      end
+    end
+
+    def update
+      invoice = Invoice.find(params[:id])
+      if invoice.update(invoice_params)
+        render_success
+      else
+        render_failure invoice
+      end
+    end
+
+    def destroy
+      invoice = Invoice.find(params[:id])
+      if invoice.destroy
+        render_success
+      else
+        render_failure invoice
+      end
+    end
+
+
+    private
+    def apply_params
+      params.permit(:category, :is_tax_rebate, :ticket_at, :name, :taxpaper_number, :address, :phone, :bank, :bank_number)
+    end
+
+    def detail_params
+      params.permit(:category, :specification, :unit, :num, :price, :amount)
+    end
+
+    def invoice_params
+      params.permit(:number, :no_tax_amount, :taxt_amount, :amount, :date_at)
+    end
+  end
+end

data/app/controllers/educode_sales/key_person_controller.rb

@@ -23,7 +23,7 @@ module EducodeSales
 
     private
     def key_params
-      params.permit(:attitude_id, :sex, :birth_date, :remark, :tel)
+      params.permit(:attitude_id, :sex, :birth_date, :remark, :tel, :name)
     end
   end
 end

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -0,0 +1,116 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class MoneyPlanRecordsController < ApplicationController
+
+    def index
+      respond_to do |format|
+        format.html do
+        end
+        format.js do
+        end
+        format.json do
+          @money_plan_records = MoneyPlanRecord.left_joins(:money_plan_claims).group("educode_sales_money_plan_records.id").select("educode_sales_money_plan_records.*, COUNT(educode_sales_money_plan_claims.id) AS claim_num")
+          if @current_admin.is_admin?
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '回款管理').level
+            case level
+            when '自己'
+              @money_plan_records = @money_plan_records.where(staff_id: @current_admin.id)
+            when '区域'
+              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(:id)
+              @money_plan_records = @money_plan_records.joins(:business).where("educode_sales_businesses.id in (?) OR educode_sales_money_plans.staff_id = ?", b_ids, @current_admin.id)
+            end
+          end
+
+          if params[:q].present? && params[:q][:payer_name].present?
+            @money_plan_records = @money_plan_records.where("payer_name like ?", "%#{params[:q][:payer_name]}%")
+          end
+
+          if params[:q].present? && params[:q][:date_at].present?
+            date = params[:q][:date_at].split(" - ")
+            @money_plan_records = @money_plan_records.where("date_at BETWEEN ? AND ?", date[0], date[1])
+          end
+          if params[:q].present? && params[:q][:state].present?
+            if params[:q][:state] == '已认领'
+              @money_plan_records = @money_plan_records.having("claim_num > 0")
+            elsif params[:q][:state] == '待认领'
+              @money_plan_records = @money_plan_records.having("claim_num = 0 AND business_id IS NOT NULL")
+            elsif params[:q][:state] == '无对应合同'
+              @money_plan_records = @money_plan_records.having("claim_num = 0 AND business_id IS NULL")
+            end
+              
+          end
+          if params[:q].present? && params[:q][:amount].present?
+            @money_plan_records = @money_plan_records.where(amount: params[:q][:amount])
+          end
+
+          if params[:sort].present? && params[:sort][:field]
+            @money_plan_records = @money_plan_records.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @money_plan_records = @money_plan_records.order(created_at: :desc)
+          end
+          @money_plan_records = @money_plan_records.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def add
+      render layout: false
+    end
+
+    def confirm_plan
+      @money_plan_record = MoneyPlanRecord.find(params[:id])
+      gon.money_plan_records = []
+      gon.money_plan_ids = []
+      gon.money_plan_claim_amount = []
+      @money_plan_claim = nil
+      @money_plan_claims = @money_plan_record.money_plan_claims.each_with_index do |d, i|
+        if i == 0
+          @money_plan_claim = d
+        end
+        gon.money_plan_records << [{value: d.money_plan_id.to_s, name: "#{d.money_plan.business&.number}/#{d.money_plan.business&.name}/#{d.money_plan.business&.school&.name}/ #{d.money_plan.business.last_follow_up&.actual_amount}万 / #{d.money_plan.date_at.to_s(:date)}"}]
+        gon.money_plan_ids << d.money_plan_id.to_s
+        gon.money_plan_claim_amount << [d.amount]
+      end
+      render layout: false
+    end
+
+    def create
+      business_id = Business.find_by(id: params[:business_id])&.id
+      record = MoneyPlanRecord.new(amount: params[:amount], payer_name: params[:payer_name], date_at: params[:date_at], staff_id: @current_admin.id, business_id: business_id)
+      if record.save
+        render_success
+      else
+        render_failure record
+      end
+    end
+
+    def upload
+      xlsx = Roo::Spreadsheet.open(params[:file])
+      ods = xlsx.sheet(0)
+      rows = ods.last_row - 1
+      rows.times do |r|  #行数
+        next unless ods.row(r+2)[0]
+        business_id = Business.find_by(number: ods.row(r+2)[3].to_s.strip)&.id
+        EducodeSales::MoneyPlanRecord.create(payer_name: ods.row(r+2)[0].to_s.strip, amount: ods.row(r+2)[1].to_s.strip, date_at: ods.row(r+2)[2].to_s.strip, business_id: business_id, staff_id: @current_admin.id) if business_id
+      end
+      
+      render json: { succcess: true}
+    end
+
+    def confirm
+      money_plan_record = MoneyPlanRecord.find(params[:id])
+      money_plan_record.money_plan_claims.where.not(money_plan_id: params[:money_plan_ids]).delete_all
+      (params[:num].to_i + 1).times do |i|
+        claim = money_plan_record.money_plan_claims.find_or_initialize_by(money_plan_id: params[:money_plan_ids][i])
+        claim.amount = params["amount[#{i}]"]
+        claim.staff =  @current_admin
+        claim.save
+      end
+      
+      render_success
+    end
+  end
+end

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -4,51 +4,30 @@ module EducodeSales
   class MoneyPlansController < ApplicationController
 
     def index
-      follow_up_ids = Business.pluck(:last_follow_up_id)
       authorize! :read, MoneyPlan
       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
-          x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+          @money_plans = MoneyPlan.joins(:business).left_joins(:money_plan_claims).group("educode_sales_money_plans.id").select("educode_sales_money_plans.*, COUNT(educode_sales_money_plan_claims.id) AS claim_num")
           if @current_admin.is_admin?
-            @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids)
           else
             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.id)
+              @money_plans = @money_plans.where(staff_id: @current_admin.id)
             when '区域'
-              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(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)
+              b_ids = Business.where(school_id: school_ids).pluck(:id)
+              @money_plans = @money_plans.where("educode_sales_businesses.id in (?) OR educode_sales_money_plans.staff_id = ?", b_ids, @current_admin.id)
             end
           end
 
           if params[:q].present? && params[:q][:business].present?
-            follow_up_ids = Business.where("name like ?", "%#{params[:q][:business]}%").pluck(:last_follow_up_id)
-            @money_plans = @money_plans.where(follow_up_id: follow_up_ids)
+            @money_plans = @money_plans.where("educode_sales_businesses.name like ?", "%#{params[:q][:business]}%")
           end
           if params[:q].present? && params[:q][:school].present?
-            school_ids = School.where("name like ?", "%#{params[:q][:school]}%").pluck(:id)
-            follow_up_ids = Business.where(school_id: school_ids).pluck(:last_follow_up_id)
-            @money_plans = @money_plans.where(follow_up_id: follow_up_ids)
-          end
-          if params[:q].present? && params[:q][:staff_id].present?
-            @money_plans = @money_plans.where(staff_id: params[:q][:staff_id])
-          end
-          if params[:q].present? && params[:q][:clazz].present?
-            @money_plans = @money_plans.where(clazz: params[:q][:clazz])
-          end
-          if params[:q].present? && params[:q][:date].present?
-            date = params[:q][:date].split(" - ")
-            @money_plans = @money_plans.where("educode_sales_money_plans.date_at >= ? AND educode_sales_money_plans.date_at < ?", date[0], date[1] + '23:59:59')
+            @money_plans = @money_plans.joins(business: :school).where("schools.name like ?", "%#{params[:q][:school]}%")
           end
 
           if params[:sort].present? && params[:sort][:field]
@@ -56,10 +35,35 @@ module EducodeSales
           else
             @money_plans = @money_plans.order(date_at: :desc)
           end
-          @total_amount = @money_plans.sum(:amount)
           @money_plans = @money_plans.page(params[:page]).per(params[:limit])
         end
       end
     end
+
+    def list
+      follow_up_ids = Business.pluck(:last_follow_up_id)
+      authorize! :read, MoneyPlan
+      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
+  
+      end
+    end
+
+    def add
+      render layout: false
+    end
+
+    def create
+      business = Business.find(params[:business_id])
+      data = []
+      (params[:num].to_i+1).times do |i|
+        business.money_plans.create(category: params["category[#{i}]"], amount: params["amount[#{i}]"], payment_clause: params["payment_clause[#{i}]"], date_at: params["date_at[#{i}]"], follow_up_id: business.last_follow_up_id, staff_id: @current_admin.id )
+      end
+      render_success
+    end
+
   end
 end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -235,9 +235,9 @@ module EducodeSales
           if params[:business_count_type] == 'money' || params[:business_count_type].blank?
             data = provinces.map { |province|
               if params[:business_type].blank?
-                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).sum(:total_amount).round(2)
+                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).sum(:budget_amount).round(2)
               else
-                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id in (?)", params[:business_type].split(",")).sum(:total_amount).round(2)
+                Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id in (?)", params[:business_type].split(",")).sum(:budget_amount).round(2)
               end
             }
             if params[:sort_by].present?

data/app/controllers/educode_sales/sales_details_controller.rb

@@ -157,7 +157,7 @@ module EducodeSales
     private
 
     def sales_detail_params
-      params.permit(:amount, :price, :total_price, :custom_clazz, :delivery_date, :product_catalog_id)
+      params.permit(:amount, :price, :total_price, :custom_clazz, :delivery_date, :product_catalog_id, :proprietorship)
     end
 
   end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -9,8 +9,13 @@ module EducodeSales
         last_follow = follow_up.business.follow_ups.where.not(id: follow_up.id).order("id desc").first
         if last_follow.present? && last_follow.key_people_count > 0
           @person = last_follow.key_person.last
-          gon.teacher = "t-#{@person.teacher_id}"
-          gon.teachers = { value: "t-#{@person.teacher_id}", name: @person.teacher.name }
+          if @person&.teacher.present?
+            gon.teacher = "t-#{@person.teacher_id}"
+            gon.teachers = { value: "t-#{@person.teacher_id}", name: @person.name }
+          else
+            gon.teacher = ""
+            gon.teachers = {}
+          end
         end
       end
       @attitudes = Common.where(clazz: 'key_attitude').order("position").pluck(:name, :id)

data/app/models/educode_sales/business.rb

@@ -18,6 +18,13 @@ module EducodeSales
     has_many :business_levels, dependent: :destroy
     has_many :business_watches, dependent: :destroy
     has_many :business_histories, dependent: :destroy
+    has_many :money_plans
+
+    has_one :invoice_apply
+    has_many :invoice_details
+    has_many :sales_details
+
+    belongs_to :school
 
     belongs_to :sourcable, :polymorphic => true, optional: true
 

data/app/models/educode_sales/invoice.rb

@@ -0,0 +1,5 @@
+module EducodeSales
+  class Invoice < ApplicationRecord
+    belongs_to :invoice_apply, counter_cache: true
+  end
+end

data/app/models/educode_sales/invoice_apply.rb

@@ -0,0 +1,12 @@
+module EducodeSales
+  class InvoiceApply < ApplicationRecord
+    belongs_to :business
+    belongs_to :staff
+    belongs_to :take_ticket, class_name: 'Staff', optional: true
+    has_many :invoice_details
+    has_many :invoices
+
+    enum category: ['纸质专用发票', '纸质普通发票', '电子普通发票']
+    enum state: ['审核中', '已开票']
+  end
+end

data/app/models/educode_sales/invoice_detail.rb

@@ -0,0 +1,10 @@
+module EducodeSales
+  class InvoiceDetail < ApplicationRecord
+    belongs_to :invoice_apply, optional: true
+    belongs_to :sale_detail, class_name: 'SalesDetail'
+    belongs_to :business
+
+    enum category: ['软件', '技术服务', '硬件', '装修服务', '咨询服务', '会议服务']
+    enum state: ['待开票', '已开票']
+  end
+end

data/app/models/educode_sales/key_person.rb

@@ -1,6 +1,6 @@
 module EducodeSales
   class KeyPerson < ApplicationRecord
-    belongs_to :teacher
+    belongs_to :teacher, optional: true
     belongs_to :attitude, class_name: 'Common', optional: true
     belongs_to :follow_up, counter_cache: true