educode_sales 0.6.4 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd066340676e40c41aa18730eacf453f8bf228ceb4416179f0e916581525999
-  data.tar.gz: a30becf3c8cc2c925c21b66948d429a241d3750289f5e921ab3c0cde5aeea3f4
+  metadata.gz: 41b7c2e662fd724e27b8a995fe3f8fe5733384fe5454ffff038a22fe7526b6ad
+  data.tar.gz: '09abc1d2d95817c2fc4e1dbc73beb1a31beb24239e2401b25c41125bf7864130'
 SHA512:
-  metadata.gz: adabc609d925eb080964dc566815134c5384f258fde90b7008296ceacf178a1435be37c553f49291844ce7043f6dfc4745f7713da687f40da40871acc67a6f8e
-  data.tar.gz: 042b06433756725fad2b2bd4bb612bca89616f3e18e6055e5c2df4a89d8ece4810f9fe80899047a52c86d60c6e263b14bdb92ee9107efe63bb662ee51dd73041
+  metadata.gz: 7305c066cefb80249560e179eee5f84caedde9e223cb45311ebca66462251be8280cfb5c577da14d3c946ed485fadcca6342160e571203f0d25ccb987fca0f7b
+  data.tar.gz: 3896cf2a1252a590053116ceac804abbc6cdae787b8f055a4258cfc388b8832aea623d561e5fe3ae4ce76e22347aa606f3e0f40e138c4747d535b5d75e2070c3

data/app/controllers/educode_sales/activities_controller.rb

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

data/app/controllers/educode_sales/businesses_controller.rb

@@ -3,29 +3,6 @@ require_dependency "educode_sales/application_controller"
 module EducodeSales
   class BusinessesController < ApplicationController
 
-    def file
-      gon.folder = edu_setting('attachment_folder') + '/'
-      render layout: false
-    end
-    def upload_file
-      render layout: false
-    end
-    def time_line
-      @business = Business.find(params[:business_id])
-      respond_to do |format|
-        format.html do
-          @follow_ups = @business.follow_ups.order(created_at: :desc)
-          # @latest = @follow_ups.order(created_at: :desc).first
-          # if params[:field]
-          #   @follow_ups = @follow_ups.order("#{params[:field]} #{params[:order]}")
-          # else
-          #   @follow_ups = @follow_ups.order("created_at desc")
-          # end
-          # @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
-          render layout: false
-        end
-      end
-    end
 
     def index
       authorize! :read, Business
@@ -33,21 +10,37 @@ module EducodeSales
         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::SalePlan) || can?(:update, EducodeSales::Business) || can?(:destroy, EducodeSales::Business)
+          # @more = can?(:create, EducodeSales::SalePlan) || can?(:update, EducodeSales::Business) || can?(:destroy, EducodeSales::Business) || can?(:show_file, EducodeSales::Business)
+          @more = true
           gon.menus = []
+          gon.export_menus = []
           gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
+          gon.business_type = Common.where(clazz: 'business_type').map do |d|
+            {value: d.id, name: d.name}
+          end
+          gon.type = params[:clazz_id].present? ? [{ value: params[:clazz_id], name: Common.find(params[:clazz_id]).name }] : []
+          gon.business_step = Common.where(clazz: 'business_step').map do |d|
+            {value: d.id, name: d.name}
+          end
           if can?(:create, EducodeSales::SalePlan)
             gon.menus << { title: '添加周计划', event: 'week' }
             gon.menus << { title: '添加月计划', event: 'month' }
           end
           gon.menus << { title: '跟进时间线', event: 'time_line' }
-          gon.menus << { title: '附件管理', event: 'file' }
+          if can?(:show_file, EducodeSales::Business)
+            gon.menus << { title: '附件管理', event: 'file' }
+          end
           if can?(:update, EducodeSales::Business)
             gon.menus << { title: '编辑', event: 'edit' }
           end
           if can?(:destroy, EducodeSales::Business)
             gon.menus << { title: '删除', event: 'delete' }
           end
+          if can?(:export_business, EducodeSales::Business)
+            gon.export_menus << { title: '导出到Csv文件', event: 'export_csv' }
+            gon.export_menus << { title: '导出到Excel文件', event: 'export_excel' }
+          end
+          gon.export_menus << { title: '导出记录', event: 'export_records' }
         end
         format.json do
           if @current_admin.is_admin?
@@ -71,41 +64,56 @@ module EducodeSales
             @year = params[:q][:name].split("-")[1].present? ? params[:q][:name].split("-")[1] : ''
           end
 
-          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-现有商机)"
-            a_id = Common.find_by(extras: EducodeSales::Common::ATYPE)&.id
-            b_id = Common.find_by(extras: EducodeSales::Common::BTYPE)&.id
-            c_id = Common.find_by(extras: EducodeSales::Common::CTYPE)&.id
-            d_id = Common.find_by(extras: EducodeSales::Common::DTYPE)&.id
-            e_id = Common.find_by(extras: EducodeSales::Common::ETYPE)&.id
-            o_id = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
-            ids = [a_id ,b_id ,c_id ,d_id ,e_id ,o_id]
-            @businesses = @businesses.joins("
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-现有商机)"
+            ids = Common.where(extras: %w[a_class b_class c_class d_class e_class o_class]).pluck(:id)
+            if @year == '全部'
+              @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
             ").where("educode_sales_follow_ups.clazz_id in (?)",ids)
+            else
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.clazz_id in (?)",ids).where("educode_sales_follow_ups.year = ?",@year)
+            end
+
           end
 
           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已中标商机)"
             stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-            @businesses = @businesses.joins("
+            if @year == '全部'
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id IN (?)",stage_ids)
+            else
+              @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
             ").where("educode_sales_follow_ups.bidded_date > ? AND educode_sales_follow_ups.bidded_date < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids)
+            end
+
           end
 
           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已签单商机)"
             s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-            @businesses = @businesses.joins("
+            if @year == '全部'
+              @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id IN (?)",s_stage_ids)
+            else
+              @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
             ").where("educode_sales_follow_ups.signed_date > ? AND educode_sales_follow_ups.signed_date < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids)
+            end
           end
 
           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已回款商机)"
             x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
-            # @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ? AND educode_sales_businesses.return_money > 0", "#{@year}-01-01", "#{@year}-12-31").joins("
-            #   JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
-            # ").where.not("educode_sales_follow_ups.clazz_id = ?",x_id)
             year_time = "#{@year}-01-01 00:00:00"
             year_over_time = "#{@year}-12-31 23:59:59"
-            @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).distinct
+            if @year == '全部'
+              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", 1).distinct
+            else
+              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).distinct
+            end
           end
 
           if params[:q].present? && params[:q][:all].present?
@@ -119,7 +127,7 @@ module EducodeSales
           end
 
           @businesses = @businesses
-          if params[:q].present? && params[:q][:name].present? && params[:q][:name] != "(销售态势-" + @year + "-已中标商机)" && params[:q][:name] != "(销售态势-" + @year + "-已签单商机)" && params[:q][:name] != "(销售态势-" + @year + "-已回款商机)" && params[:q][:name] != "(销售态势-现有商机)"
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] != "(销售态势-" + @year + "-已中标商机)" && params[:q][:name] != "(销售态势-" + @year + "-已签单商机)" && params[:q][:name] != "(销售态势-" + @year + "-已回款商机)" && params[:q][:name] != "(销售态势-" + @year + "-现有商机)"
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
           end
           if params[:q].present? && params[:q][:department].present?
@@ -137,12 +145,12 @@ module EducodeSales
           if params[:q].present? && params[:q][: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 = ?", params[:q][:business_type])
+            ").where("educode_sales_follow_ups.clazz_id in (?)", params[:q][:business_type].split(",").map(&:to_i))
           end
           if params[:q].present? && params[:q][: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 = ?", params[:q][:business_step])
+            ").where("educode_sales_follow_ups.stage_id in (?)", params[:q][:business_step].split(",").map(&:to_i))
           end
           if  params[:q].present? && params[:q][:place_id].present?
             @businesses = @businesses.joins("
@@ -177,6 +185,13 @@ module EducodeSales
             @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1] + '23:59:59')
           end
 
+          if params[:q].present? && params[:q][:invitation_at].present?
+            date = params[:q][: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
@@ -185,9 +200,7 @@ module EducodeSales
 
           @business_count = @businesses.count
 
-
-
-          @businesses = @businesses.select("
+          @businesses_exports = @businesses.select("
             educode_sales_businesses.*,
             last_follow.invitation_at,
             last_follow.reception_at,
@@ -195,9 +208,12 @@ module EducodeSales
             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
-          ").page(params[:page]).per(params[:limit])
+          ")
+
+          @businesses = @businesses_exports.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -332,6 +348,46 @@ module EducodeSales
       render layout: false
     end
 
+    def file
+      gon.folder = edu_setting('attachment_folder') + '/'
+      render layout: false
+    end
+    def upload_file
+      render layout: false
+    end
+    def time_line
+      @business = Business.find(params[:business_id])
+      respond_to do |format|
+        format.html do
+          @follow_ups = @business.follow_ups.order(created_at: :desc)
+          render layout: false
+        end
+      end
+    end
+
+    def export_records
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+          @records = BusinessExportRecord.all.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+    def add_export_records
+      if params[:type] == 'csv'
+        record = BusinessExportRecord.new(name: '商机数据表.csv', staff_id: @current_admin.id)
+      else params[:type] == 'excel'
+        record = BusinessExportRecord.new(name: '商机数据表.xls', staff_id: @current_admin.id)
+      end
+      if record.save
+        render_success
+      else
+        render_failure business
+      end
+    end
+
     private
 
     def load_business

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -12,21 +12,22 @@ module EducodeSales
           @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
           if @current_admin.is_admin?
-            @money_plans = MoneyPlan.where(follow_up_id: follow_up_ids)
+            @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.where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.staff_id)
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.id)
             when '区域'
-              a_ids = MoneyPlan.where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.staff_id).ids
+              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)
               b_ids = Business.where(school_id: school_ids).pluck(:last_follow_up_id)
               ids = a_ids + b_ids
-              @money_plans = MoneyPlan.where(id: ids)
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(id: ids)
             else
-              @money_plans = MoneyPlan.where(follow_up_id: follow_up_ids)
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids)
             end
           end
 
@@ -47,13 +48,13 @@ module EducodeSales
           end
           if params[:q].present? && params[:q][:date].present?
             date = params[:q][:date].split(" - ")
-            @money_plans = @money_plans.where("educode_sales_money_plans.created_at > ? AND educode_sales_money_plans.created_at < ?", date[0], date[1] + '23:59:59')
+            @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')
           end
 
           if params[:sort].present? && params[:sort][:field]
             @money_plans = @money_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
-            @money_plans = @money_plans.order(created_at: :desc)
+            @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])

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -7,24 +7,41 @@ module EducodeSales
     def trends
       # authorize! :trends,  EducodeSales::SaleTrend
       @year = params[:year] ? params[:year] : Time.now.year
-      @years = (1..(Time.now.year - 2014)).reverse_each.map { |d| 2014 + d }
-      year_time = "#{@year}-01-01 00:00:00"
-      year_over_time = "#{@year}-12-31 23:59:59"
-      x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
-      o = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
-      @sale_trend = SaleTrend.find_or_create_by(year: @year)
-      @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).sum(:total_amount).round(2)
-      stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-      @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).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).sum(:total_amount).round(2)
-      @actual_goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).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).sum(:actual_amount).round(2)
-      s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-      @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).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).sum(:total_amount).round(2)
-      @actual_service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).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).sum(:actual_amount).round(2)
-      @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).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).sum(:amount).round(2)
-      a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)
-      @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).sum(:total_amount).round(2)
-      b = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name).pluck(:id)
-      @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", b).sum(:total_amount).round(2)
+      @years = ['全部'] + (1..(Time.now.year - 2014)).reverse_each.map { |d| 2014 + d }
+      if(@year == '全部')
+        x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+        o = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
+        @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).sum(:total_amount).round(2)
+        stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
+        @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", stage_ids).sum(:total_amount).round(2)
+        @actual_goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", stage_ids).sum(:actual_amount).round(2)
+        s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
+        @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).sum(:total_amount).round(2)
+        @actual_service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).sum(:actual_amount).round(2)
+        @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).sum(:amount).round(2)
+        a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)
+        @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).sum(:total_amount).round(2)
+        b = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name).pluck(:id)
+        @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", b).sum(:total_amount).round(2)
+      else
+        year_time = "#{@year}-01-01 00:00:00"
+        year_over_time = "#{@year}-12-31 23:59:59"
+        x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+        o = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
+        @sale_trend = SaleTrend.find_or_create_by(year: @year)
+        @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.year = ?",@year).sum(:total_amount).round(2)
+        stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
+        @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).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).sum(:total_amount).round(2)
+        @actual_goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).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).sum(:actual_amount).round(2)
+        s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
+        @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).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).sum(:total_amount).round(2)
+        @actual_service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).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).sum(:actual_amount).round(2)
+        @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).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).sum(:amount).round(2)
+        a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)
+        @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).where("educode_sales_follow_ups.year = ?",@year).sum(:total_amount).round(2)
+        b = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name).pluck(:id)
+        @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", b).where("educode_sales_follow_ups.year = ?",@year).sum(:total_amount).round(2)
+      end
 
       count_type = params[:count_type] || "actual_amount"
       common = Common.find_by(clazz: 'staff_type', name: '销售')
@@ -116,6 +133,76 @@ module EducodeSales
 
 
 
+      #  销售人员跟进分析
+      begin_time = Time.now.at_beginning_of_year.to_s
+      end_time = Time.now.at_end_of_year.to_s
+      customer_time_range = params[:customer_time_range]
+      case customer_time_range
+      when 'last_week'
+        begin_time = (Time.now - 1.week).at_beginning_of_week.to_s
+        end_time = (Time.now - 1.week).at_end_of_week.to_s
+      when 'this_week'
+        begin_time = Time.now.at_beginning_of_week.to_s
+        end_time = Time.now.at_end_of_week.to_s
+      when 'last_month'
+        begin_time = (Time.now - 1.month).at_beginning_of_month.to_s
+        end_time = (Time.now - 1.month).at_end_of_month.to_s
+      when 'this_month'
+        begin_time = Time.now.at_beginning_of_month.to_s
+        end_time = Time.now.at_end_of_month.to_s
+      when 'last_year'
+        begin_time = (Time.now - 1.year).at_beginning_of_year.to_s
+        end_time = (Time.now - 1.year).at_end_of_year.to_s
+      when 'this_year'
+        begin_time = Time.now.at_beginning_of_year.to_s
+        end_time = Time.now.at_end_of_year.to_s
+      when 'all'
+        begin_time = (Time.now - 5.year).at_beginning_of_year.to_s
+        end_time = (Time.now + 5.year).at_end_of_year.to_s
+      when 'diy'
+        if params[:customer_date].present?
+          date = params[:customer_date].split(" - ")
+          begin_time = date[0]
+          end_time = date[1]
+        end
+      end
+      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)
+      if params[:customer_count_type] == 'money' || params[:customer_count_type].blank?
+        @customer_data =  {
+          labels: staff_names,
+          datasets:[
+            {
+              label: "跟进客户数",
+              data: staff_ids.map{|staff_id|
+                (EducodeSales::CustomerFollow.where(staff_id: staff_id).where("created_at >= ? AND created_at <= ?", begin_time, end_time).pluck(:school_id) + EducodeSales::Business.where(id: EducodeSales::FollowUp.where(staff_id: staff_id).where("created_at >= ? AND created_at <= ?", begin_time, end_time).pluck(:business_id).uniq).pluck(:school_id)).uniq.size
+              },
+              backgroundColor: colors[0],
+              borderColor: colors[0],
+              borderWidth: 1
+            }
+          ]
+        }
+      else
+        @customer_data =  {
+          labels: staff_names,
+          datasets:[
+            {
+              label: "跟进客户次数",
+              data: staff_ids.map{|staff_id|
+                EducodeSales::CustomerFollow.where(staff_id: staff_id).where("created_at >= ? AND created_at <= ?", begin_time, end_time).size + EducodeSales::FollowUp.where(staff_id: staff_id).where("created_at >= ? AND created_at <= ?", begin_time, end_time).size
+              },
+              backgroundColor: colors[0],
+              borderColor: colors[0],
+              borderWidth: 1
+            }
+          ]
+        }
+      end
+
+
+
       # 已中标图表
       goal_default_dates = ("#{Time.now.year}-01".."#{Time.now.year}-#{Time.now.month}").to_a
       sale_names = ['已中标','已签单','已回款']

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

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -34,114 +34,22 @@ module EducodeSales
     def update
       follow_up = TeacherFollow.find(params[:id])
       follow_up.assign_attributes(follow_up_params)
-      # follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_amount.to_i) * 0.01 if follow_up.actual_amount
       if follow_up.save
         render_success
       else
         render_failure follow_up
       end
     end
-    #
-    # def teachers
-    #   follow_up = @current_admin.follow_ups.find_by(id: params[:id])
-    #   if follow_up.present?
-    #     @teachers = follow_up.key_person.includes(:teacher).page(params[:page]).per(params[:limit])
-    #   else
-    #     @teachers = FollowUp.none
-    #   end
-    # end
-    #
-    # def money_plans
-    #   follow_up = @current_admin.follow_ups.find_by(id: params[:id])
-    #   @money_plans = follow_up.money_plans.page(params[:page]).per(params[:limit])
-    # end
-    #
-    # def add_money
-    #   follow_up = @current_admin.follow_ups.find(params[:id])
-    #   money_plan = follow_up.money_plans.build(date_at: params[:date_at], amount: params[:amount], clazz: params[:clazz])
-    #   money_plan.staff = @current_admin
-    #   if money_plan.save
-    #     render_success
-    #   else
-    #     render_failure money_plan
-    #   end
-    # end
-    #
-    # def update_money
-    #   follow_up = @current_admin.follow_ups.find_by(id: params[:id])
-    #   money_plan = follow_up.money_plans.find(params[:plan_id])
-    #   if money_plan.update(date_at: params[:date_at], amount: params[:amount], clazz: params[:clazz])
-    #     render_success
-    #   else
-    #     render_failure money_plan
-    #   end
-    # end
-    #
-    # def delete_money
-    #   follow_up = @current_admin.follow_ups.find_by(id: params[:id])
-    #   money_plan = follow_up.money_plans.find(params[:plan_id])
-    #   if money_plan.destroy
-    #     render_success
-    #   else
-    #     render_failure money_plan
-    #   end
-    # end
-    #
-    # def add_keys
-    #   follow_up = @current_admin.follow_ups.find(params[:id])
-    #   if params[:name].blank?
-    #     return render_failure '请从平台里选择教师'
-    #   end
-    #
-    #   names = params[:name].split("-")
-    #   if names[0] == 't'
-    #     # 从教师列表里选择的用户
-    #     teacher = Teacher.find(names[1])
-    #     key_peprson = KeyPerson.new(teacher_params)
-    #     key_peprson.teacher = teacher
-    #   else
-    #     # 从头歌平台选择的用户
-    #     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
-    #     )
-    #     teacher.save
-    #     key_peprson = KeyPerson.new(teacher_params)
-    #     key_peprson.teacher = teacher
-    #   end
-    #
-    #   follow_up.key_person << key_peprson
-    #   if follow_up.save!
-    #     render_success
-    #   else
-    #     render_failure follow_up
-    #   end
-    # rescue ActiveRecord::RecordInvalid => e
-    #   if e.message.include?("Teacher已经被使用") || e.message.include?('Key person是无效的')
-    #     render_failure '该老师已在关键人列表中'
-    #   else
-    #     render_failure e.message
-    #   end
-    # end
 
     private
 
     def load_teacher
       @teacher = Teacher.find(params[:teacher_id])
     end
-    #
+
     def follow_up_params
       params.permit(:attitude_id, :follow_id, :course_plan_id, :course_build_id, :description)
     end
-    #
-    # def teacher_params
-    #   params.permit(:professional_title, :job, :attitude_id, :sex, :birth_date, :remark)
-    # end
 
   end
 end

data/app/models/educode_sales/business_export_record.rb

@@ -0,0 +1,5 @@
+module EducodeSales
+  class BusinessExportRecord < ApplicationRecord
+    belongs_to :staff
+  end
+end

data/app/views/educode_sales/activities/index.html.erb

@@ -223,4 +223,10 @@
         });
 
     });
-</script>
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 0px; !important;
+    }
+
+</style>

data/app/views/educode_sales/activities/new.html.erb

@@ -12,7 +12,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">活动时间</label>
       <div class="layui-input-block">
-        <input type="text" name="start_at" required lay-verify="required" class="layui-input" id="new_time" placeholder="请选择时间">
+        <input type="text" name="start_at" autocomplete="off" required lay-verify="required" class="layui-input" id="new_time" placeholder="请选择时间">
       </div>
     </div>
     <div class="layui-inline">