educode_sales 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b94517f09287290104a7f5b99842db680f96336a78f7261a7478c4c9d8ca66af
-  data.tar.gz: 9dd809965284e5d22f39ebf18110ad1c54514391d1e2d75fef04c2a686f29ef9
+  metadata.gz: 6b8eb210d7095cfc2bfc9eded67a0ccd365c69ea32a1d40ff9708611a4d6e914
+  data.tar.gz: 4aef89a38ff10ea255e252ae0a10ce02918b4c23797445d87c0f02d09acc7147
 SHA512:
-  metadata.gz: 662c0d5a18f51954d831ce9d935b603d595a9b255325a44f56a2edeb6f7e018a10ee779e3b994a8a3903782a0d9367bc82d16b437eae21e6fa2736721ab419cb
-  data.tar.gz: 573ff431ba910018a90d61a568a4f1cc25ec4ff1667a8222918c560bcdf673e0f9521256f773959bdada669c4efa339d9827cf899ccf5dcef96849ed22ae4471
+  metadata.gz: d941248d1f719724eefc1ece705b18054b55b6408b358c90c30d698baf479894f8dd44a0c21d13add7a92dbb1cd7257438f727379e679db01b3564d993956c46
+  data.tar.gz: 618d22270adcf2a882eae5cbdaf2770bc1f747a65dde8201336fcbe40a66be8e023127a865b9e631fcfb7305ee2ebc78ad47a11a2d5985280c269ca46297d891

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -9,7 +9,8 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @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")
+          last_follow_up_ids = Business.all.pluck(:last_follow_up_id)
+          @money_plans = MoneyPlan.where(follow_up_id: last_follow_up_ids).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?
           else
             level = @current_admin.role.role_areas.find_by(clazz: '回款管理').level

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -4,6 +4,7 @@ module EducodeSales
   class SaleTrendsController < ApplicationController
     # authorize_resource class: false
     include SaleTrendsHelper
+    include SaleTrendsCountHelper
     def trends
       # authorize! :trends,  EducodeSales::SaleTrend
       @year = params[:year] ? params[:year] : Time.now.year
@@ -389,60 +390,15 @@ module EducodeSales
     def goal_forecast
       respond_to do |format|
         format.html do
-
         end
         format.js do
-          property = params[:property] || nil
-          staff_id = params[:staff_id] || nil
-          @forecast_count_range = params[:forecast_count_range] || "month"
-          forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%m") }.uniq
-          sale_names = %w[计划投标额 计划投标额累计 实际中标额 实际中标额累计]
-          case @forecast_count_range
-          when "week"
-            # 年初第一天周数是0会导致周数重复计算
-            if params[:forecast_date_day].present?
-              date = params[:forecast_date_day].split(" - ")
-              dates = (date[0].to_date..date[1].to_date).map { |d| d.strftime("%Y-%W") }.uniq.select { |d| d.split("-")[1] != '00' }
-              @forecast_count_data = goal_forecast_week(dates, sale_names, staff_id, property)
-            else
-              forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%W") }.uniq.select { |d| d.split("-")[1] != '00' }
-              @forecast_count_data = goal_forecast_week(forecast_default_dates, sale_names, staff_id, property)
-            end
-          when "quarter"
-            # 按年
-            if params[:forecast_date_year].present?
-              date = params[:forecast_date_year].split(" - ")
-              dates = (date[0]..date[1]).to_a
-              dates = dates.map { |d| [d.to_s + "-" + "1", d.to_s + "-" + "2", d.to_s + "-" + "3", d.to_s + "-" + "4"] }.flatten
-              @forecast_count_data = goal_forecast_quarter(dates, sale_names, staff_id, property)
-            else
-              forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y") }.uniq
-              forecast_default_dates = forecast_default_dates.map { |d| [d.to_s + "-" + "1", d.to_s + "-" + "2", d.to_s + "-" + "3", d.to_s + "-" + "4"] }.flatten
-              @forecast_count_data = goal_forecast_quarter(forecast_default_dates, sale_names, staff_id, property)
-            end
-          when "month" # 按月
-            if params[:forecast_date_month].present?
-              date = params[:forecast_date_month].split(" - ")
-              date[0] = (date[0] + "-01").to_date.to_s
-              date[1] = (date[1] + "-01").to_date.end_of_month.to_s
-              dates = ((date[0] + "-01").to_date..(date[1] + "-01").to_date).map { |d| d.strftime("%Y-%m") }.uniq
-              @forecast_count_data = goal_forecast_month(dates, sale_names, staff_id, property)
-            else
-              @forecast_count_data = goal_forecast_month(forecast_default_dates, sale_names, staff_id, property)
-            end
+          if params[:forecast_type].blank? || params[:forecast_type] == "money"
+            p "按金额"
+            goal_forecast_money
           else
-            # 按年
-            if params[:forecast_date_year].present?
-              date = params[:forecast_date_year].split(" - ")
-              dates = (date[0]..date[1]).to_a
-              @forecast_count_data = goal_forecast_year(dates, sale_names, staff_id, property)
-            else
-              forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y") }.uniq
-              @forecast_count_data = goal_forecast_year(forecast_default_dates, sale_names, staff_id, property)
-            end
+            p "按数量"
+            goal_forecast_count
           end
-          @forecast_count_data_0 = @forecast_count_data[0]
-          @forecast_count_data_1 = @forecast_count_data[1]
         end
       end
     end
@@ -738,5 +694,113 @@ module EducodeSales
       }
     end
 
+    def goal_forecast_money
+      property = params[:property] || nil
+      staff_id = params[:staff_id] || nil
+      @forecast_count_range = params[:forecast_count_range] || "month"
+      forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%m") }.uniq
+      sale_names = %w[计划投标额 计划投标额累计 实际中标额 实际中标额累计]
+      case @forecast_count_range
+      when "week"
+        # 年初第一天周数是0会导致周数重复计算
+        if params[:forecast_date_day].present?
+          date = params[:forecast_date_day].split(" - ")
+          dates = (date[0].to_date..date[1].to_date).map { |d| d.strftime("%Y-%W") }.uniq.select { |d| d.split("-")[1] != '00' }
+          @forecast_count_data = goal_forecast_week(dates, sale_names, staff_id, property)
+        else
+          forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%W") }.uniq.select { |d| d.split("-")[1] != '00' }
+          @forecast_count_data = goal_forecast_week(forecast_default_dates, sale_names, staff_id, property)
+        end
+      when "quarter"
+        # 按年
+        if params[:forecast_date_year].present?
+          date = params[:forecast_date_year].split(" - ")
+          dates = (date[0]..date[1]).to_a
+          dates = dates.map { |d| [d.to_s + "-" + "1", d.to_s + "-" + "2", d.to_s + "-" + "3", d.to_s + "-" + "4"] }.flatten
+          @forecast_count_data = goal_forecast_quarter(dates, sale_names, staff_id, property)
+        else
+          forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y") }.uniq
+          forecast_default_dates = forecast_default_dates.map { |d| [d.to_s + "-" + "1", d.to_s + "-" + "2", d.to_s + "-" + "3", d.to_s + "-" + "4"] }.flatten
+          @forecast_count_data = goal_forecast_quarter(forecast_default_dates, sale_names, staff_id, property)
+        end
+      when "month" # 按月
+        if params[:forecast_date_month].present?
+          date = params[:forecast_date_month].split(" - ")
+          date[0] = (date[0] + "-01").to_date.to_s
+          date[1] = (date[1] + "-01").to_date.end_of_month.to_s
+          dates = ((date[0] + "-01").to_date..(date[1] + "-01").to_date).map { |d| d.strftime("%Y-%m") }.uniq
+          @forecast_count_data = goal_forecast_month(dates, sale_names, staff_id, property)
+        else
+          @forecast_count_data = goal_forecast_month(forecast_default_dates, sale_names, staff_id, property)
+        end
+      else
+        # 按年
+        if params[:forecast_date_year].present?
+          date = params[:forecast_date_year].split(" - ")
+          dates = (date[0]..date[1]).to_a
+          @forecast_count_data = goal_forecast_year(dates, sale_names, staff_id, property)
+        else
+          forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y") }.uniq
+          @forecast_count_data = goal_forecast_year(forecast_default_dates, sale_names, staff_id, property)
+        end
+      end
+      @forecast_count_data_0 = @forecast_count_data[0]
+      @forecast_count_data_1 = @forecast_count_data[1]
+    end
+
+    def goal_forecast_count
+      property = params[:property] || nil
+      staff_id = params[:staff_id] || nil
+      @forecast_count_range = params[:forecast_count_range] || "month"
+      forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%m") }.uniq
+      sale_names = %w[计划投标额 计划投标额累计 实际中标额 实际中标额累计]
+      case @forecast_count_range
+      when "week"
+        # 年初第一天周数是0会导致周数重复计算
+        if params[:forecast_date_day].present?
+          date = params[:forecast_date_day].split(" - ")
+          dates = (date[0].to_date..date[1].to_date).map { |d| d.strftime("%Y-%W") }.uniq.select { |d| d.split("-")[1] != '00' }
+          @forecast_count_data = goal_forecast_week_count(dates, sale_names, staff_id, property)
+        else
+          forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%W") }.uniq.select { |d| d.split("-")[1] != '00' }
+          @forecast_count_data = goal_forecast_week_count(forecast_default_dates, sale_names, staff_id, property)
+        end
+      when "quarter"
+        # 按年
+        if params[:forecast_date_year].present?
+          date = params[:forecast_date_year].split(" - ")
+          dates = (date[0]..date[1]).to_a
+          dates = dates.map { |d| [d.to_s + "-" + "1", d.to_s + "-" + "2", d.to_s + "-" + "3", d.to_s + "-" + "4"] }.flatten
+          @forecast_count_data = goal_forecast_quarter_count(dates, sale_names, staff_id, property)
+        else
+          forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y") }.uniq
+          forecast_default_dates = forecast_default_dates.map { |d| [d.to_s + "-" + "1", d.to_s + "-" + "2", d.to_s + "-" + "3", d.to_s + "-" + "4"] }.flatten
+          @forecast_count_data = goal_forecast_quarter_count(forecast_default_dates, sale_names, staff_id, property)
+        end
+      when "month" # 按月
+        if params[:forecast_date_month].present?
+          date = params[:forecast_date_month].split(" - ")
+          date[0] = (date[0] + "-01").to_date.to_s
+          date[1] = (date[1] + "-01").to_date.end_of_month.to_s
+          dates = ((date[0] + "-01").to_date..(date[1] + "-01").to_date).map { |d| d.strftime("%Y-%m") }.uniq
+          @forecast_count_data = goal_forecast_month_count(dates, sale_names, staff_id, property)
+        else
+          @forecast_count_data = goal_forecast_month_count(forecast_default_dates, sale_names, staff_id, property)
+        end
+      else
+        # 按年
+        if params[:forecast_date_year].present?
+          date = params[:forecast_date_year].split(" - ")
+          dates = (date[0]..date[1]).to_a
+          @forecast_count_data = goal_forecast_year_count(dates, sale_names, staff_id, property)
+        else
+          forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y") }.uniq
+          @forecast_count_data = goal_forecast_year_count(forecast_default_dates, sale_names, staff_id, property)
+        end
+      end
+      @forecast_count_data_0 = @forecast_count_data[0]
+      @forecast_count_data_1 = @forecast_count_data[1]
+    end
+
   end
 end

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -132,7 +132,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:attitude_id, :follow_id, :course_plan_id, :course_build_id, :description, :advise)
+      params.permit(:attitude_id, :follow_id, :course_plan_id, :course_build_id, :description, :advise, :is_contact)
     end
 
   end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -48,6 +48,21 @@ module EducodeSales
           if can?(:destroy, EducodeSales::Teacher)
             gon.menus << { title: '删除', event: 'delete' }
           end
+
+          filter = Filter.find_or_create_by(staff_id: @current_admin.id, clazz: "teachers")
+          gon.filter = filter.extras || {}
+          # if filter.extras.present?
+          #   # if filter.extras['area'].nil?
+          #   #   filter.extras['area'] = 1
+          #   #   filter.extras['property'] = 1
+          #   #   filter.extras['sale_way'] = 1
+          #   # end
+          #   # filter.save
+          #   gon.filter = filter.extras
+          # else
+          #   gon.filter = {'area': 1, 'property': 1, 'sale_way': 1}
+          # end
+
         end
         format.json do
           @staff_manages = {}
@@ -181,6 +196,11 @@ module EducodeSales
               LEFT JOIN educode_sales_teacher_follows AS last_follow ON last_follow.id = educode_sales_teachers.follow_up_id AND last_follow.deleted_at IS NULL
             ")
           end
+
+          if params[:q].present? && params[:q][:is_contact].present?
+            @teachers = @teachers.where("last_follow.is_contact = ?" , params[:q][:is_contact].to_i)
+          end
+
           if params[:sort].present? && params[:sort][:field]
             @teachers = @teachers.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else

data/app/helpers/educode_sales/sale_trends_count_helper.rb

@@ -0,0 +1,347 @@
+module EducodeSales
+  module SaleTrendsCountHelper
+    NAMES = %w[计划投标额 计划投标额累计 实际中标额 实际中标额累计]
+
+    def goal_forecast_quarter_count(labels, selects, staff_id = nil, property)
+      plan_get_count = plan_get_count(staff_id, labels, "quarter", property)
+      actual_get_count = actual_get_count(staff_id, labels, "quarter", property)
+      datasets = selects.map.with_index do |select, i|
+        data = if select == NAMES[0]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_get_count[[year, quarter]]&.pluck(:business_id)&.uniq&.reject(&:blank?)&.size.to_f.round(3)
+                 end
+               elsif select == NAMES[1]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_get_count[[year, quarter]]&.pluck(:business_id)&.uniq&.reject(&:blank?)&.size.to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == NAMES[2]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_get_count[[year, quarter]]&.pluck(:business_id)&.uniq&.reject(&:blank?)&.size.to_f.round(3)
+                 end
+               elsif select == NAMES[3]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_get_count[[year, quarter]]&.pluck(:business_id)&.uniq&.reject(&:blank?)&.size.to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+        type = if select == NAMES[3] || select == NAMES[1]
+                 'line'
+               else
+                 "bar"
+               end
+        backgroundColor = if select == NAMES[3] || select == NAMES[1]
+                            'rgba(54, 162, 235, 0.2)'
+                          else
+                            SaleTrend::COLORS[i]
+                          end
+        {
+          type: type,
+          label: select,
+          data: data.map { |d| d.round(2) },
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
+      end
+      hash_a = {
+        labels: labels,
+        datasets: [datasets[0], datasets[2]]
+      }
+      hash_b = {
+        labels: labels,
+        datasets: [datasets[1], datasets[3]]
+      }
+      [hash_a, hash_b]
+    end
+
+    def goal_forecast_week_count(labels, selects, staff_id = nil, property)
+
+      plan_get_count = plan_get_count(staff_id, labels, "week", property)
+      actual_get_count = actual_get_count(staff_id, labels, "week", property)
+      datasets = selects.map.with_index do |select, i|
+        data = if select == NAMES[0]
+                 labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   plan_get_count[yearweek].to_f.round(3)
+                 end
+               elsif select == NAMES[1]
+                 arr = labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   plan_get_count[yearweek].to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == NAMES[2]
+                 labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   actual_get_count[yearweek].to_f.round(3)
+                 end
+               elsif select == NAMES[3]
+                 arr = labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   actual_get_count[yearweek].to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+        type = if select == NAMES[0] || select == NAMES[2]
+                 'bar'
+               else
+                 "line"
+               end
+        backgroundColor = if select == NAMES[0] || select == NAMES[2]
+                            SaleTrend::COLORS[i]
+                          else
+                            'rgba(54, 162, 235, 0.2)'
+                          end
+        {
+          type: type,
+          label: select,
+          data: data.map { |d| d.round(2) },
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
+      end
+
+      hash_a = {
+        labels: labels,
+        datasets: [datasets[0], datasets[2]]
+      }
+      hash_b = {
+        labels: labels,
+        datasets: [datasets[1], datasets[3]]
+      }
+      [hash_a, hash_b]
+    end
+
+    def goal_forecast_month_count(labels, selects, staff_id = nil, property)
+      plan_get_count = plan_get_count(staff_id, labels, "month", property)
+      actual_get_count = actual_get_count(staff_id, labels, "month", property)
+      datasets = selects.map.with_index do |select, i|
+        data = if select == NAMES[0]
+                 labels.map do |d|
+                   month = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_get_count[[year, month]]&.pluck(:business_id)&.uniq&.reject(&:blank?)&.size.to_f.round(3)
+                 end
+               elsif select == NAMES[1]
+                 arr = labels.map do |d|
+                   month = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_get_count[[year, month]]&.pluck(:business_id)&.uniq&.reject(&:blank?)&.size.to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == NAMES[2]
+                 labels.map do |d|
+                   month = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_get_count[[year, month]]&.pluck(:business_id)&.uniq&.reject(&:blank?)&.size.to_f.round(3)
+                 end
+               elsif select == NAMES[3]
+                 arr = labels.map do |d|
+                   month = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_get_count[[year, month]]&.pluck(:business_id)&.uniq&.reject(&:blank?)&.size.to_f.round(3)
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+
+        type = if select == NAMES[3] || select == NAMES[1]
+                 'line'
+               else
+                 "bar"
+               end
+        backgroundColor = if select == NAMES[3] || select == NAMES[1]
+                            'rgba(54, 162, 235, 0.2)'
+                          else
+                            SaleTrend::COLORS[i]
+                          end
+        {
+          type: type,
+          label: select,
+          data: data.map { |d| d.round(2) },
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
+      end
+
+      hash_a = {
+        labels: labels,
+        datasets: [datasets[0], datasets[2]]
+      }
+      hash_b = {
+        labels: labels,
+        datasets: [datasets[1], datasets[3]]
+      }
+      [hash_a, hash_b]
+    end
+
+    def goal_forecast_year_count(labels, selects, staff_id = nil, property)
+      plan_get_count = plan_get_count(staff_id, labels, "year", property)
+      actual_get_count = actual_get_count(staff_id, labels, "year", property)
+      datasets = selects.map.with_index do |select, i|
+        data = if select == NAMES[0]
+                 labels.map { |d| plan_get_count[d.to_i] || 0 }
+               elsif select == NAMES[1]
+                 arr = labels.map { |d| plan_get_count[d.to_i] || 0 }
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == NAMES[2]
+                 labels.map { |d| actual_get_count[d.to_i] || 0 }
+               elsif select == NAMES[3]
+                 arr = labels.map { |d| actual_get_count[d.to_i] || 0 }
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+
+        type = if select == NAMES[3] || select == NAMES[1]
+                 'line'
+               else
+                 "bar"
+               end
+        backgroundColor = if select == NAMES[3] || select == NAMES[1]
+                            'rgba(54, 162, 235, 0.2)'
+                          else
+                            SaleTrend::COLORS[i]
+                          end
+        {
+          type: type,
+          label: select,
+          data: data.map { |d| d.round(2) },
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
+      end
+      hash_a = {
+        labels: labels,
+        datasets: [datasets[0], datasets[2]]
+      }
+      hash_b = {
+        labels: labels,
+        datasets: [datasets[1], datasets[3]]
+      }
+      [hash_a, hash_b]
+    end
+
+    private
+
+    def plan_get_count(staff_id, time_range, type, property)
+      # budget_amount 预算额
+      start_time = case type
+                   when "month"
+                     time_range.first + "-01"
+                   when "year"
+                     time_range.first + "-01-01"
+                   when "week"
+                     time_range.first.split("-").first + "-01-01"
+                   when "quarter"
+                     time_range.first.split("-").first + "-01-01"
+                   end
+      end_time = case type
+                 when "month"
+                   time_range.last + "-31"
+                 when "year"
+                   time_range.last + "-12-31"
+                 when "week"
+                   time_range.last.split("-").first + "-12-31"
+                 when "quarter"
+                   time_range.last.split("-").first + "-12-31"
+                 end
+      staff_id = staff_id.present? ? Array(staff_id) : nil
+      data = Business.joins(:last_follow_up)
+                     .where("educode_sales_follow_ups.invitation_at >= ? and educode_sales_follow_ups.invitation_at <= ?", start_time, end_time)
+      if staff_id.present?
+        data = data.joins("LEFT JOIN educode_sales_follow_ups AS last_follow_up ON educode_sales_businesses.last_follow_up_id = last_follow_up.id AND last_follow_up.deleted_at IS NULL
+                                             LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = last_follow_up.id").
+          where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", staff_id, staff_id)
+      end
+      if property.present?
+        data = data.joins(department: [school: :school_tags]).where("school_tags.id = ?", property)
+      end
+      case type
+      when "week"
+        data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.invitation_at) as week").group("yearweek(educode_sales_follow_ups.invitation_at)").count("distinct educode_sales_follow_ups.business_id")
+      when "quarter"
+        data = data.select("educode_sales_follow_ups.*, quarter(educode_sales_follow_ups.invitation_at) as quarter, year(educode_sales_follow_ups.invitation_at) as year")
+        data.group_by { |d| [d.year, d.quarter] }
+      when "month"
+        data = data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.invitation_at) as year, month(educode_sales_follow_ups.invitation_at) as month")
+        data.group_by { |d| [d.year, d.month] }
+      when "year"
+        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.invitation_at) as year").group("year(educode_sales_follow_ups.invitation_at)").count("distinct educode_sales_follow_ups.business_id")
+      end
+    end
+
+    def actual_get_count(staff_id, time_range, type, property)
+      start_time = case type
+                   when "month"
+                     time_range.first + "-01"
+                   when "year"
+                     time_range.first + "-01-01"
+                   when "week"
+                     time_range.first.split("-").first + "-01-01"
+                   when "quarter"
+                     time_range.first.split("-").first + "-01-01"
+                   end
+      end_time = case type
+                 when "month"
+                   time_range.last + "-31"
+                 when "year"
+                   time_range.last + "-12-31"
+                 when "week"
+                   time_range.last.split("-").first + "-12-31"
+                 when "quarter"
+                   time_range.last.split("-").first + "-12-31"
+                 end
+      # actual_amount 合同额
+      staff_id = staff_id.present? ? Array(staff_id) : nil
+      data = Business.joins(:last_follow_up)
+                     .where("educode_sales_follow_ups.bidded_date >= ? and educode_sales_follow_ups.bidded_date <= ? ", start_time, end_time)
+      if staff_id.present?
+        data = data.joins("LEFT JOIN educode_sales_follow_ups AS last_follow_up ON educode_sales_businesses.last_follow_up_id = last_follow_up.id AND last_follow_up.deleted_at IS NULL
+                                             LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = last_follow_up.id").
+          where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", staff_id, staff_id)
+      end
+      if property.present?
+        data = data.joins(department: [school: :school_tags]).where("school_tags.id = ?", property)
+      end
+      case type
+      when "week"
+        Business.joins(:last_follow_up).select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.bidded_date) as week").group("yearweek(educode_sales_follow_ups.bidded_date)").count("distinct educode_sales_follow_ups.business_id")
+      when "quarter"
+        data = data.select("educode_sales_follow_ups.*, quarter(educode_sales_follow_ups.bidded_date) as quarter, year(educode_sales_follow_ups.bidded_date) as year")
+        data.group_by { |d| [d.year, d.quarter] }
+      when "month"
+        data = data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.bidded_date) as year, month(educode_sales_follow_ups.bidded_date) as month")
+        data.group_by { |d| [d.year, d.month] }
+      when "year"
+        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.bidded_date) as year").group("year(educode_sales_follow_ups.bidded_date)").count("distinct educode_sales_follow_ups.business_id")
+      end
+    end
+
+  end
+end