educode_sales 0.7.1 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd1dede8ec609b98a19dcd71c21bac7b6024098a7cdb8bad5c600784bd9a649e
-  data.tar.gz: 34bdddc9c368c11588d2d9dc0a3307f8cfbc4568489f539e344b13f32bf41702
+  metadata.gz: e481393e6e2fb7a42757e804b0e2be3381abad943a7e860c403fe12c655571c1
+  data.tar.gz: dad674b1735e1cf66839f0757bc5dba844b15135339ce8fcc92ca71dc894143c
 SHA512:
-  metadata.gz: 372e451790e777e0c9df20e7bdd9bc133e4d15351c6ae5b541c53a9761b14c2cbd5645c7517d0ae20ea4301872592fd43de82013ae90166546b5ae647b59db32
-  data.tar.gz: f9a5c5518474de3e1aa03e2fe1fae7bbede839df9649227e1c0c0ddba1f4aaaf62e3e903c813c3115dd7d792d56e48e9c6659226cf0ed4b29169ac1198dda8a4
+  metadata.gz: a6d11197cb72adbfc6e98c448c38a706273fb1c5a4d5ff27c0c153bf056e01dbc4ec6051ead65b27a9796233beac8f475969a68b9921a344a64ddbbce661a481
+  data.tar.gz: 7e630350f05c53575453206d8a6df23601911dc982d517517fc313af9d8d1831f5f22f39c6e2058e5891c3f9adc4304cbb3bb2abc15e2bdb6281cc3c93c2e2c1

data/app/controllers/educode_sales/businesses_controller.rb

@@ -152,11 +152,16 @@ module EducodeSales
               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 (?)", params[:q][:business_step].split(",").map(&:to_i))
           end
-          if  params[:q].present? && params[:q][:place_id].present?
+          if params[:q].present? && params[:q][:place_id].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.place_id = ?", params[:q][:place_id])
           end
+          if params[:q].present? && params[:q][:business_year].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.year = ?", params[:q][:business_year])
+          end
 
           if params[:q].present? && params[:q][:area].present?
             p = EducodeSales::Common.find(params[:q][:area]).name
@@ -193,7 +198,11 @@ module EducodeSales
           end
 
           if params[:sort].present? && params[:sort][:field]
-            @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+            if params[:sort][:field] = "service_end_time"
+              @businesses = @businesses.order("service_time_long #{params[:sort][:order]}")
+            else
+              @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+            end
           else
             @businesses = @businesses.order("educode_sales_businesses.created_at desc")
           end
@@ -203,6 +212,9 @@ module EducodeSales
           @businesses = @businesses.select("
             educode_sales_businesses.*,
             last_follow.invitation_at,
+            last_follow.service_time_long,
+            last_follow.service_end_time,
+            last_follow.service_start_time,
             last_follow.reception_at,
             last_follow.bidded_date,
             last_follow.signed_date,
@@ -554,6 +566,9 @@ module EducodeSales
             educode_sales_businesses.*,
             last_follow.invitation_at,
             last_follow.reception_at,
+            last_follow.service_time_long,
+            last_follow.service_end_time,
+            last_follow.service_start_time,
             last_follow.bidded_date,
             last_follow.signed_date,
             last_follow.created_at as latest_time,

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -63,11 +63,17 @@ module EducodeSales
     def create
       load_business
       follow_up = @business.follow_ups.build(follow_up_params)
+      if params[:service_time].present?
+        date = params[:service_time].split(" - ")
+        follow_up.service_start_time = date[0]
+        follow_up.service_end_time = date[1]
+        follow_up.service_time_long = (date[1].to_date - date[0].to_date).to_i
+      end
       follow_up.staff = @current_admin
       params[:assign_follow_up].each do |d|
         follow_up.assign_follow_ups.build(staff_id: d)
       end
-      
+
       follow_up.profit_amount = follow_up.actual_amount - (follow_up.divide_amount.to_i) if follow_up.actual_amount
       if follow_up.save
         if @business.last_follow_up.present?
@@ -95,7 +101,7 @@ module EducodeSales
       business = follow_up.business
       if follow_up.soft_destroy(@current_admin.id)
         if follow_up.id == business.last_follow_up_id
-          business.update(last_follow_up: business.follow_ups.last, return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: business.follow_ups.last&.id).sum(:amount))
+          business.update(last_follow_up: business.follow_ups.last, return_money: MoneyPlan.where(clazz: '实际回款', follow_up_id: business.follow_ups.last&.id).sum(:amount))
         end
         render_success
       else
@@ -106,6 +112,12 @@ module EducodeSales
     def update
       follow_up = FollowUp.find(params[:id])
       follow_up.assign_attributes(follow_up_params)
+      if params[:service_time].present?
+        date = params[:service_time].split(" - ")
+        follow_up.service_start_time = date[0]
+        follow_up.service_end_time = date[1]
+        follow_up.service_time_long = (date[1].to_date - date[0].to_date).to_i
+      end
       assign_follow_ups = []
       params[:assign_follow_up].each do |d|
         assign_follow_ups << follow_up.assign_follow_ups.find_or_initialize_by(staff_id: d)

data/app/controllers/educode_sales/results_controller.rb

@@ -0,0 +1,54 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class ResultsController < ApplicationController
+
+    def index
+      respond_to do |format|
+        format.html do
+        end
+        format.json do
+          # @commons = Common.group("clazz").page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    # def create
+    #   common = Common.new(name: params[:name], clazz: params[:clazz])
+    #   if common.save
+    #     render_success
+    #   else
+    #     render_failure common
+    #   end
+    # end
+    #
+    # def edit
+    #   @common = Common.find(params[:id])
+    #   render layout: false
+    # end
+    #
+    # def update
+    #   common = Common.find(params[:id])
+    #   if common.update(common_params)
+    #     render_success
+    #   else
+    #     render_failure common
+    #   end
+    # end
+    #
+    # def new
+    #   render layout: false
+    # end
+    #
+    # def show
+    #   commons = Common.find(params[:id])
+    #   @commons = Common.where(clazz: commons.clazz).order('position')
+    # end
+    #
+    # private
+    #
+    # def common_params
+    #   params.permit(:name, :position)
+    # end
+  end
+end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -8,14 +8,14 @@ module EducodeSales
       # authorize! :trends,  EducodeSales::SaleTrend
       @year = params[:year] ? params[:year] : Time.now.year
       @years = ['全部'] + (1..(Time.now.year - 2014)).reverse_each.map { |d| 2014 + d }
-      if(@year == '全部')
+      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)
+        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)
+        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)
@@ -29,62 +29,63 @@ module EducodeSales
         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)
+        @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)
+        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)
+        @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)
+        @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: '销售')
       names = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
       x_business_ids = []
-      default_dates = (30.day.ago.to_date..Date.today).map { |d| d.strftime("%Y-%W")}.uniq #默认时间范围
+      default_dates = (30.day.ago.to_date..Date.today).map { |d| d.strftime("%Y-%W") }.uniq #默认时间范围
       Business.all.each do |d|
         if d.last_follow_up&.clazz&.id == x
           x_business_ids << d.id
         end
       end
-      colors = ['#44D7B6','#4CACFF','#F7B500','#FF0000', '#FF7F00', '#FFFF00', '#00FF00', '#00FFFF', '#0000FF', '#8B00FF', 'rgba(255, 99, 132, 1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)' ,'rgba(255, 0, 250, 1)']
+      colors = ['#44D7B6', '#4CACFF', '#F7B500', '#FF0000', '#FF7F00', '#FFFF00', '#00FF00', '#00FFFF', '#0000FF', '#8B00FF', 'rgba(255, 99, 132, 1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)', 'rgba(255, 0, 250, 1)']
       @follow_count_range = params[:follow_count_range] || "week"
       @goal_count_range = params[:goal_count_range] || "month"
       # 商机跟进数图表
-      @follow_count_data = week_follow_count_chart(default_dates,names,x_business_ids,colors)
+      @follow_count_data = week_follow_count_chart(default_dates, names, x_business_ids, colors)
       if params[:follow_count_range].present?
         case params[:follow_count_range]
-        when "week"   #按周
+        when "week" #按周
           if params[:date_week].present?
             date = params[:date_week].split(" - ")
             dates = (date[0].to_date..date[1].to_date).map { |d|
-              d.strftime("%Y-%W")}.uniq
-            @follow_count_data = week_follow_count_chart(dates,names,x_business_ids,colors)
+              d.strftime("%Y-%W") }.uniq
+            @follow_count_data = week_follow_count_chart(dates, names, x_business_ids, colors)
           end
-        when "month"  #按月
+        when "month" #按月
           if params[:date_month].present?
             # (Date.new(2020,12,1)..Date.new(2021,12,1)).map { |d| d.strftime("%Y-%m")}.uniq
             date = params[:date_month].split(" - ")
-            dates = ((date[0]+"-01").to_date..(date[1]+"-01").to_date).map { |d| d.strftime("%Y-%m")}.uniq
-            @follow_count_data = month_follow_count_chart(dates,names,x_business_ids,colors)
+            dates = ((date[0] + "-01").to_date..(date[1] + "-01").to_date).map { |d| d.strftime("%Y-%m") }.uniq
+            @follow_count_data = month_follow_count_chart(dates, names, x_business_ids, colors)
           end
-        when "year"   #按年
+        when "year" #按年
           if params[:date_year].present?
             date = params[:date_year].split(" - ")
             dates = (date[0]..date[1]).to_a
-            @follow_count_data = year_follow_count_chart(dates,names,x_business_ids,colors)
+            @follow_count_data = year_follow_count_chart(dates, names, x_business_ids, colors)
           end
-        else          #按天
+        else
+          #按天
           if params[:date].present?
             date = params[:date].split(" - ")
             dates = (date[0].to_date..date[1].to_date).to_a
-            @follow_count_data = day_follow_count_chart(dates,names,x_business_ids,colors)
+            @follow_count_data = day_follow_count_chart(dates, names, x_business_ids, colors)
           end
         end
       end
@@ -92,12 +93,12 @@ module EducodeSales
       #商机区域分布图表
       provinces = EducodeSales::Common.where(clazz: 'area').pluck(:name)
       if params[:business_count_type] == 'money' || params[:business_count_type].blank?
-        @business_data =  {
+        @business_data = {
           labels: provinces,
-          datasets:[
+          datasets: [
             {
               label: "商机总额",
-              data: provinces.map{|province|
+              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 != ?", x).sum(:total_amount).round(2)
                 else
@@ -111,12 +112,12 @@ module EducodeSales
           ]
         }
       else
-        @business_data =  {
+        @business_data = {
           labels: provinces,
-          datasets:[
+          datasets: [
             {
               label: "商机数量",
-              data: provinces.map{|province|
+              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 != ?", x).count
                 else
@@ -131,8 +132,6 @@ module EducodeSales
         }
       end
 
-
-
       #  销售人员跟进分析
       begin_time = Time.now.at_beginning_of_year.to_s
       end_time = Time.now.at_end_of_year.to_s
@@ -166,18 +165,16 @@ module EducodeSales
           end_time = date[1] + "23:59:59"
         end
       end
-      100.times{p begin_time}
-      100.times{p end_time}
       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_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 =  {
+        @customer_data = {
           labels: staff_names,
-          datasets:[
+          datasets: [
             {
               label: "跟进客户数",
-              data: staff_ids.map{|staff_id|
+              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],
@@ -187,12 +184,12 @@ module EducodeSales
           ]
         }
       else
-        @customer_data =  {
+        @customer_data = {
           labels: staff_names,
-          datasets:[
+          datasets: [
             {
               label: "跟进客户次数",
-              data: staff_ids.map{|staff_id|
+              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],
@@ -203,26 +200,25 @@ module EducodeSales
         }
       end
 
-
-
-      # 已中标图表
-      goal_default_dates = ("#{Time.now.year}-01".."#{Time.now.year}-#{Time.now.month}").to_a
-      sale_names = ['已中标','已签单','已回款']
-       @goal_count_data = month_sale_chart(goal_default_dates,sale_names,colors,x,stage_ids,s_stage_ids,count_type)
+      # 销售额分析
+      goal_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 = ['已中标', '已签单', '已回款']
+      @goal_count_data = month_sale_chart(goal_default_dates, sale_names, colors, x, stage_ids, s_stage_ids, count_type)
       if params[:goal_count_range].present?
         case params[:goal_count_range]
         when "week"
-        when "month"  #按月
+        when "month" #按月
           if params[:goal_date_month].present?
             date = params[:goal_date_month].split(" - ")
-            dates = ((date[0]+"-01").to_date..(date[1]+"-01").to_date).map { |d| d.strftime("%Y-%m")}.uniq
-            @goal_count_data =  month_sale_chart(dates,sale_names,colors,x,stage_ids,s_stage_ids,count_type)
+            dates = ((date[0] + "-01").to_date..(date[1] + "-01").to_date).map { |d| d.strftime("%Y-%m") }.uniq
+            @goal_count_data = month_sale_chart(dates, sale_names, colors, x, stage_ids, s_stage_ids, count_type)
           end
-          else        #按年
+        else
+          #按年
           if params[:goal_date_year].present?
             date = params[:goal_date_year].split(" - ")
             dates = (date[0]..date[1]).to_a
-            @goal_count_data = year_sale_chart(dates,sale_names,colors,x,stage_ids,s_stage_ids,count_type)
+            @goal_count_data = year_sale_chart(dates, sale_names, colors, x, stage_ids, s_stage_ids, count_type)
           end
         end
       end
@@ -247,140 +243,144 @@ module EducodeSales
       params.permit(:chance_money, :ballot_money, :sign_money, :returned_money)
     end
 
-    def day_follow_count_chart(dates,names,x_business_ids,colors)
+    def day_follow_count_chart(dates, names, x_business_ids, colors)
       {
         labels: dates,
-        datasets:names.map.with_index do |name,i|
+        datasets: names.map.with_index do |name, i|
           {
             # hidden: i < 3 ? false : true,
             label: name[0],
-            data: dates.map{ |d| @follow_up = FollowUp.where(staff_id: name[1], created_at: d.beginning_of_day..d.end_of_day).where.not(business: x_business_ids).count },
+            data: dates.map { |d| @follow_up = FollowUp.where(staff_id: name[1], created_at: d.beginning_of_day..d.end_of_day).where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
-            pointBorderColor: colors[i%15+1],
-            borderColor: colors[i%15+1],
-            pointBackgroundColor: colors[i%15+1],
+            pointBorderColor: colors[i % 15 + 1],
+            borderColor: colors[i % 15 + 1],
+            pointBackgroundColor: colors[i % 15 + 1],
             borderWidth: 2
           }
         end
       }
     end
-    def week_follow_count_chart(dates,names,x_business_ids,colors)
+
+    def week_follow_count_chart(dates, names, x_business_ids, colors)
       {
-        labels: dates.map{ |date|
+        labels: dates.map { |date|
           d = date.split("-")
           year = d[0].to_i
           week = d[1].to_i
           if week == 0
             0
           else
-            month = Date.commercial(year,week).strftime("%m月%d日")
-            day = Date.commercial(year,week,7).strftime("%m月%d日")
+            month = Date.commercial(year, week).strftime("%m月%d日")
+            day = Date.commercial(year, week, 7).strftime("%m月%d日")
             date.to_s + "(#{month}-#{day})"
           end
         } - [0],
-        datasets:names.map.with_index do |name,i|
+        datasets: names.map.with_index do |name, i|
           {
             # hidden: i < 3 ? false : true,
             label: name[0],
-            data: dates.map{ |d|
+            data: dates.map { |d|
               d = d.split("-")
               year = d[0].to_i
               week = d[1].to_i
-               if week == 0
-                 @follow_up = 999999
-               else
-                 @follow_up = FollowUp.where(staff_id: name[1]).where("created_at >= ? AND created_at <= ?", Date.commercial(year,week).strftime("%Y-%m-%d"), Date.commercial(year,week,7).strftime("%Y-%m-%d")).where.not(business: x_business_ids).count
-               end
-               } - [999999],
+              if week == 0
+                @follow_up = 999999
+              else
+                @follow_up = FollowUp.where(staff_id: name[1]).where("created_at >= ? AND created_at <= ?", Date.commercial(year, week).strftime("%Y-%m-%d"), Date.commercial(year, week, 7).strftime("%Y-%m-%d")).where.not(business: x_business_ids).count
+              end
+            } - [999999],
             backgroundColor: "#fff",
-            pointBorderColor: colors[i%15+1],
-            borderColor: colors[i%15+1],
-            pointBackgroundColor: colors[i%15+1],
+            pointBorderColor: colors[i % 15 + 1],
+            borderColor: colors[i % 15 + 1],
+            pointBackgroundColor: colors[i % 15 + 1],
             borderWidth: 2
           }
         end
       }
     end
-    def month_follow_count_chart(dates,names,x_business_ids,colors)
+
+    def month_follow_count_chart(dates, names, x_business_ids, colors)
       {
         labels: dates,
-        datasets:names.map.with_index do |name,i|
+        datasets: names.map.with_index do |name, i|
           {
             # hidden: i < 3 ? false : true,
             label: name[0],
-            data: dates.map { |d| @follow_up = FollowUp.where( staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01", "#{d}-31").where.not(business: x_business_ids).count },
+            data: dates.map { |d| @follow_up = FollowUp.where(staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01", "#{d}-31").where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
-            pointBorderColor: colors[i%15+1],
-            borderColor: colors[i%15+1],
-            pointBackgroundColor: colors[i%15+1],
+            pointBorderColor: colors[i % 15 + 1],
+            borderColor: colors[i % 15 + 1],
+            pointBackgroundColor: colors[i % 15 + 1],
             borderWidth: 2,
           }
         end
       }
     end
-    def year_follow_count_chart(dates,names,x_business_ids,colors)
+
+    def year_follow_count_chart(dates, names, x_business_ids, colors)
       {
         labels: dates,
-        datasets:names.map.with_index do |name,i|
+        datasets: names.map.with_index do |name, i|
           {
             # hidden: i < 3 ? false : true,
             label: name[0],
-            data: dates.map { |d| @follow_up = FollowUp.where( staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01-01", "#{d}-12-31").where.not(business: x_business_ids).count },
+            data: dates.map { |d| @follow_up = FollowUp.where(staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01-01", "#{d}-12-31").where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
-            pointBorderColor: colors[i%15+1],
-            borderColor: colors[i%15+1],
-            pointBackgroundColor: colors[i%15+1],
+            pointBorderColor: colors[i % 15 + 1],
+            borderColor: colors[i % 15 + 1],
+            pointBackgroundColor: colors[i % 15 + 1],
             borderWidth: 2
           }
         end
       }
     end
 
-    def month_sale_chart(dates,names,colors,x,stage_ids,s_stage_ids,count_type)
+    def month_sale_chart(dates, names, colors, x, stage_ids, s_stage_ids, count_type)
       {
         labels: dates,
-        datasets: names.map.with_index do |name,i|{
-          label: name,
-          data: dates.map{ |d|
-            case i
-            when 0
-              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 (?)", "#{d}-01", "#{d}-31", stage_ids).sum(count_type).round(2)
-            when 1
-              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 (?)", "#{d}-01", "#{d}-31", s_stage_ids).sum(count_type).round(2)
-            else
-              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 <= ? ", "#{d}-01", "#{d}-31").sum(:amount).round(2)
-            end
-          },
-          backgroundColor: colors[i],
-          borderColor: colors[i],
-          borderWidth: 1
-        }
+        datasets: names.map.with_index do |name, i|
+          {
+            label: name,
+            data: dates.map { |d|
+              case i
+              when 0
+                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 (?)", "#{d}-01", "#{d}-31", stage_ids).sum(count_type).round(2)
+              when 1
+                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 (?)", "#{d}-01", "#{d}-31", s_stage_ids).sum(count_type).round(2)
+              else
+                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 <= ? ", "#{d}-01", "#{d}-31").sum(:amount).round(2)
+              end
+            },
+            backgroundColor: colors[i],
+            borderColor: colors[i],
+            borderWidth: 1
+          }
         end
       }
     end
 
-    def year_sale_chart(dates,names,colors,x,stage_ids,s_stage_ids,count_type)
+    def year_sale_chart(dates, names, colors, x, stage_ids, s_stage_ids, count_type)
       {
         labels: dates,
-        datasets:names.map.with_index do |name,i| {
-          label: name,
-          data: dates.map{ |d|
-            case i
-            when 0
-              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 (?)", "#{d}-01-01", "#{d}-12-31", stage_ids).sum(count_type).round(2)
-            when 1
-              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 (?)", "#{d}-01-01", "#{d}-12-31", s_stage_ids).sum(count_type).round(2)
-            else
-              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 <= ? ", "#{d}-01-01", "#{d}-12-31").sum(:amount).round(2)
-            end                           },
-          backgroundColor: colors[i],
-          borderColor: colors[i],
-          borderWidth: 1
-        }
+        datasets: names.map.with_index do |name, i|
+          {
+            label: name,
+            data: dates.map { |d|
+              case i
+              when 0
+                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 (?)", "#{d}-01-01", "#{d}-12-31", stage_ids).sum(count_type).round(2)
+              when 1
+                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 (?)", "#{d}-01-01", "#{d}-12-31", s_stage_ids).sum(count_type).round(2)
+              else
+                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 <= ? ", "#{d}-01-01", "#{d}-12-31").sum(:amount).round(2)
+              end },
+            backgroundColor: colors[i],
+            borderColor: colors[i],
+            borderWidth: 1
+          }
         end
       }
     end
 
-
   end
 end

data/app/helpers/educode_sales/follow_up_helper.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  module FollowUpHelper
+    def key_people(teacher_ids)
+      EducodeSales::Teacher.where(id: teacher_ids).pluck(:name).join('、')
+    end
+  end
+end

data/app/models/educode_sales/money_plan.rb

@@ -3,7 +3,7 @@ module EducodeSales
     belongs_to :staff
     belongs_to :follow_up, counter_cache: true
 
-    enum clazz: ['未完成', '已完成']
+    enum clazz: ['计划回款', '实际回款']
 
     after_save :update_return_money
     after_destroy :update_return_money
@@ -13,9 +13,9 @@ module EducodeSales
 
     def update_return_money
       if follow_up.business.last_follow_up_id == self.follow_up_id
-        follow_up.business.update(return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: self.follow_up_id).sum(:amount))
+        follow_up.business.update(return_money: MoneyPlan.where(clazz: '实际回款', follow_up_id: self.follow_up_id).sum(:amount))
       else
-        follow_up.update(return_money: follow_up.money_plans.where(clazz: '已完成').sum(:amount))
+        follow_up.update(return_money: follow_up.money_plans.where(clazz: '实际回款').sum(:amount))
       end
     end
   end

data/app/models/educode_sales/result.rb

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