educode_sales 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6a4ffe19355fdf757cb3714a1332b6159b0c3825f2b788cdc85c27a2ea35ce1
-  data.tar.gz: 31407d9b5ac98caff94bd770a06bf90c4b0326bd98a1813eb7e8405808b02d12
+  metadata.gz: ebca1b78e4b0b3998f9584ccf0252df25b0cbe341a2e57e69e27e3c2d9ce78d0
+  data.tar.gz: 6ae3c8a027f5388a093dc08d8586162b37d59e807ec39e3caf01b60174aec629
 SHA512:
-  metadata.gz: 3246c013b2e6a35a0fe3ed9c9fba8076000569c86e9df03b945e0a65918a25db265a63d730f1e0a9a4ccec56b9186ef9c464b8e7d6424cc71fcb7300ec941abc
-  data.tar.gz: 983547ec16762c558b4b5162c7c95b0cdb53530b58f74bf536a990e816954d7690539c5d033eca1baba5603939f214b34689dcfed9e5c518404d4ebf9f737b58
+  metadata.gz: 9408e570a47a640475921a88c573674692f14c7e0f91e9203004c3314b7b6180ddb76976a1048c2d9e6ed43b8730afbc752ebdfa5352cf8ce6f70870c33c3259
+  data.tar.gz: e56f1e509d44449d67cc32428b2024aea8a2a9a4984370795b6b74de671e242b1649aebf0163ee9369e98592148f8727ac7c0cbc7c79a4c9659205c01743c471

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -8,9 +8,9 @@ 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 }
+      x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+      o = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
       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)
@@ -26,8 +26,7 @@ module EducodeSales
       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)
@@ -43,254 +42,301 @@ module EducodeSales
         @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, d.role_id] }
-      x_business_ids = []
-      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
+
+    def sale_trends
+      sale_trend = SaleTrend.find_by(year: params[:year])
+      if sale_trend.update(sale_trend_params)
+        render_success
+      else
+        render_failure sale_trend
       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)']
+    end
+
+    def operations
+
+    end
+
+    # 商机跟进数
+    def business_followup_analysis
+      common = EducodeSales::Common.find_by(clazz: 'staff_type', name: '销售')
+      names = EducodeSales::Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id, d.role_id] }
+      x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+      x_business_ids = EducodeSales::Business.joins(last_follow_up: :clazz).where("educode_sales_commons.id = ?",x).pluck :id
+     
       @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)
-      if params[:follow_count_range].present?
-        case params[:follow_count_range]
-        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)
-          end
-        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)
-          end
-        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)
+      respond_to do |format|
+        format.html do
+          
+        end
+        format.js do
+          default_dates = (30.day.ago.to_date..Date.today).map { |d| d.strftime("%Y-%W") }.uniq #默认时间范围
+          @follow_count_data =  business_followup_charts(default_dates, names, x_business_ids, SaleTrend::COLORS, [30.day.ago.to_date.beginning_of_week, Date.today], "%Y-%u") do |default_dates|
+            default_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日")
+                date.to_s + "(#{month}-#{day})"
+              end
+            } - [0]
           end
-        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)
+        end
+        format.json do
+          if params[:follow_count_range].present?
+            case params[:follow_count_range]
+            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 =  business_followup_charts(dates, names, x_business_ids, SaleTrend::COLORS, date, "%Y%u") do |dates|
+                  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日")
+                      date.to_s + "(#{month}-#{day})"
+                    end
+                  } - [0]
+                end
+              else
+                return render json: {msg: '请选择时间范围', success: false }
+              end
+            when "month" #按月
+              if params[:date_month].present?
+                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 = business_followup_charts(dates, names, x_business_ids, SaleTrend::COLORS, [(date[0] + "-01").to_date, (date[1] + "-01").to_date.end_of_month], '%Y%m')
+              else
+                return render json: {msg: '请选择时间范围', success: false }
+              end
+            when "year" #按年
+              if params[:date_year].present?
+                date = params[:date_year].split(" - ")
+                dates = (date[0]..date[1]).to_a.map { |d| d.to_s}
+                @follow_count_data = business_followup_charts(dates, names, x_business_ids, SaleTrend::COLORS, ["#{date[0]}-01-01".to_date.beginning_of_year, "#{date[1]}-01-01".to_date.end_of_year], '%Y')
+              else
+                return render json: {msg: '请选择时间范围', success: false }
+              end
+            else
+              #按天
+              if params[:date].present?
+                date = params[:date].split(" - ")
+                dates = (date[0].to_date..date[1].to_date).to_a.map { |d| d.to_s}
+                @follow_count_data = business_followup_charts(dates, names, x_business_ids, SaleTrend::COLORS, [date[0].to_date, date[1].to_date], '%Y%m%d')
+              else
+                return render json: {msg: '请选择时间范围', success: false }
+              end
+            end
           end
+          render json: {data: @follow_count_data }
         end
       end
+   
+    end
 
-      #商机区域分布图表
-      provinces = EducodeSales::Common.where(clazz: 'area').pluck(:name)
-      if params[:business_count_type] == 'money' || params[:business_count_type].blank?
-        @business_data = {
-          labels: provinces,
-          datasets: [
-            {
-              label: "商机总额",
-              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
-                  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 = ?", params[:business_type]).sum(:total_amount).round(2)
-                end
-              },
-              backgroundColor: colors[0],
-              borderColor: colors[0],
-              borderWidth: 1
-            }
-          ]
-        }
-      else
-        @business_data = {
-          labels: provinces,
-          datasets: [
-            {
-              label: "商机数量",
-              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
-                  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 = ?", params[:business_type]).count
-                end
-              },
-              backgroundColor: colors[0],
-              borderColor: colors[0],
-              borderWidth: 1
-            }
-          ]
-        }
-      end
+    # 销售额分析
+    def sales_analysis
+      respond_to do |format|
+        format.html do
+          
+        end
+        format.js do
+          x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+          count_type = params[:count_type] || "actual_amount"
+          stage_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
+          s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
+          @goal_count_range = params[:goal_count_range] || "month"
 
-      #  销售人员跟进分析
-      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] + "00:00:00"
-          end_time = date[1] + "23:59:59"
+          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, SaleTrend::COLORS, x, stage_ids, s_stage_ids, count_type)
+          if params[:goal_count_range].present?
+            case params[:goal_count_range]
+            when "week"
+            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, SaleTrend::COLORS, x, stage_ids, s_stage_ids, count_type)
+              end
+            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, SaleTrend::COLORS, x, stage_ids, s_stage_ids, count_type)
+              end
+            end
+          end
         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
+    end
+
+    # 商机区域分布
+    def business_area
+      respond_to do |format|
+        format.html do
+          
+        end
+        format.js do
+          x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+          provinces = EducodeSales::Common.where(clazz: 'area').pluck(:name)
+          if params[:business_count_type] == 'money' || params[:business_count_type].blank?
+            @business_data = {
+              labels: provinces,
+              datasets: [
+                {
+                  label: "商机总额",
+                  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
+                      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 = ?", params[:business_type]).sum(:total_amount).round(2)
+                    end
+                  },
+                  backgroundColor: SaleTrend::COLORS[0],
+                  borderColor: SaleTrend::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
+          else
+            @business_data = {
+              labels: provinces,
+              datasets: [
+                {
+                  label: "商机数量",
+                  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
+                      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 = ?", params[:business_type]).count
+                    end
+                  },
+                  backgroundColor: SaleTrend::COLORS[0],
+                  borderColor: SaleTrend::COLORS[0],
+                  borderWidth: 1
+                }
+              ]
             }
-          ]
-        }
-      end
-
-      # 销售额分析
-      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" #按月
-          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)
-          end
-        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)
           end
         end
       end
     end
 
-    def sale_trends
-      sale_trend = SaleTrend.find_by(year: params[:year])
-      if sale_trend.update(sale_trend_params)
-        render_success
-      else
-        render_failure sale_trend
+    # 销售人员跟进分析
+    def sales_followup_analysis
+      respond_to do |format|
+        format.html do
+          
+        end
+        format.js do
+          #  销售人员跟进分析
+          @goal_count_range = params[:goal_count_range] || "month"
+          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] + " 00:00:00"
+              end_time = date[1] + " 23:59:59"
+            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: SaleTrend::COLORS[0],
+                  borderColor: SaleTrend::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: SaleTrend::COLORS[0],
+                  borderColor: SaleTrend::COLORS[0],
+                  borderWidth: 1
+                }
+              ]
+            }
+          end
+        end
       end
     end
 
-    def operations
-
-    end
-
     private
 
     def sale_trend_params
       params.permit(:chance_money, :ballot_money, :sign_money, :returned_money)
     end
 
-    def day_follow_count_chart(dates, names, x_business_ids, colors)
-      {
-        labels: dates,
-        datasets: names.map.with_index do |name, i|
-          {
-            # hidden: i < 3 ? false : true,
-            hidden: name[2] == 11,
-            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 },
-            backgroundColor: "#fff",
-            pointBorderColor: colors[i % 15 + 1],
-            borderColor: colors[i % 15 + 1],
-            pointBackgroundColor: colors[i % 15 + 1],
-            borderWidth: 2
-          }
-        end
-      }
-    end
+    def business_followup_charts(dates, names, x_business_ids, colors, date, clazz)
+      not_business = x_business_ids.present? ? x_business_ids.join(',') : ''
+      staff_ids = names.present? ? names.map { |d| d[1]}.join(",") : ''
 
-    def week_follow_count_chart(dates, names, x_business_ids, colors)
+      sql = "SELECT DATE_FORMAT(created_at, '#{clazz}') as week, count(*) as counts, staff_id
+             FROM educode_sales_follow_ups
+             WHERE date(created_at) >= '#{date[0]}' and date(created_at) <= '#{date[1]}'
+             AND business_id NOT IN (#{not_business}) and educode_sales_follow_ups.deleted_at IS NULL
+             AND staff_id IN (#{staff_ids})
+             GROUP BY DATE_FORMAT(created_at, '#{clazz}'), staff_id"
+      data = EducodeSales::FollowUp.find_by_sql(sql).group_by { |d| "#{d['staff_id']}-#{d['week']}" }
       {
-        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日")
-            date.to_s + "(#{month}-#{day})"
-          end
-        } - [0],
+        labels: block_given? ? yield(dates) : dates,
         datasets: names.map.with_index do |name, i|
           {
-            # hidden: i < 3 ? false : true,
             label: name[0],
             hidden: name[2] == 11, #role_id:11 离职角色
-            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],
+            data: dates.map { |date| data["#{name[1]}-#{ date.gsub("-", '')}"]&.[](0)&.[]('counts') || 0 },
             backgroundColor: "#fff",
             pointBorderColor: colors[i % 15 + 1],
             borderColor: colors[i % 15 + 1],
@@ -301,43 +347,6 @@ module EducodeSales
       }
     end
 
-    def month_follow_count_chart(dates, names, x_business_ids, colors)
-      {
-        labels: dates,
-        datasets: names.map.with_index do |name, i|
-          {
-            # hidden: i < 3 ? false : true,
-            label: name[0],
-            hidden: name[2] == 11,
-            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],
-            borderWidth: 2,
-          }
-        end
-      }
-    end
-
-    def year_follow_count_chart(dates, names, x_business_ids, colors)
-      {
-        labels: dates,
-        datasets: names.map.with_index do |name, i|
-          {
-            # hidden: i < 3 ? false : true,
-            label: name[0],
-            hidden: name[2] == 11,
-            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],
-            borderWidth: 2
-          }
-        end
-      }
-    end
 
     def month_sale_chart(dates, names, colors, x, stage_ids, s_stage_ids, count_type)
       {

data/app/models/educode_sales/sale_trend.rb

@@ -1,4 +1,6 @@
 module EducodeSales
   class SaleTrend < ApplicationRecord
+
+    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)']
   end
 end