educode_sales 0.9.83 → 0.9.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e769e1841e12580e3813a004cc14dca465f65b884df4152f78bcc212aa4f2c75
-  data.tar.gz: 04c60143e5bac234b3384359b3edfa651d4daac44145672e2d6cce9a75ea6679
+  metadata.gz: 85457062bb8c20c8e1703353efcb1f958eb39d5e15ca0936efac9f58ca720184
+  data.tar.gz: f115e02bf7cdfc392673bf27c533fd6d6cbb87a462936708eb3d1e8e093607f4
 SHA512:
-  metadata.gz: 0a68e73f50aa323fb5fdb40d17885d04dda68460d2bb899aa2297a984f6497ea66dadaaaaaaeb03d41716d006b19235ff23063d2a0292e13671bce5d8a3732c1
-  data.tar.gz: 28cb221ad77fc7c40a592e045c7f0c381b6938292bbaff792513a01ac1611ba9fd884b0049de218ee9ab48fa783555110e410216184ce7f81d4f6cb2ef9f68fa
+  metadata.gz: 0d0b2b9d028276ee69d72a5e480772c4676c341c8390c6bdfad9880bb9b303f8ab004c9ca2b52f44a9b0bf20e6d259a5973bb0fa83f022b4fa23cb96f27ac581
+  data.tar.gz: 2ee2104f1259feac76bc7d562616e266cce1488d5785e5383158dab5450799b7d3436822f29d57d3ae9f3c7044fb94815f3dec0450890ea6a1ef0db2451359af

data/app/controllers/educode_sales/contracts_controller.rb

@@ -233,12 +233,14 @@ module EducodeSales
       @business = Business.find(params[:id])
       @last_follow_up = @business.last_follow_up
       @deployment_type = EducodeSales::FollowUp::BUSINESS_DEPLOYMENT
+      @signed_clazz = EducodeSales::FollowUp.signed_clazzs.keys
+      
       signed_department = @last_follow_up.signed_department
       if signed_department
-        gon.department = {value: signed_department.id, name: "#{signed_department&.school&.name}-#{signed_department&.name}"}
+        gon.department = [{value: signed_department.id, name: "#{signed_department&.school&.name}-#{signed_department&.name}"}]
         gon.value = signed_department.id
       else
-        gon.department = {}
+        gon.department = []
         gon.value = ''
       end
      
@@ -452,13 +454,36 @@ module EducodeSales
       render layout: false
     end
 
+    def new_sales_detail
+      render layout: false
+    end
+
+    def select_product
+      render layout: false
+    end
+
+    def sales_detail
+      sales_detail = SalesDetail.new(sales_detail_params)
+      sales_detail.staff = @current_admin
+      if sales_detail.save
+        render_success
+      else
+        render_failure sales_detail
+      end
+    end
+
     private
     def follow_up_params
-      params.permit(:o_business_deployment, :plan_signed_date, :bidded_days, :signed_date, :signed_department_id, :service_years, :service_start_time, :service_end_time, :funding_source)
+      params.permit(:o_business_deployment, :plan_signed_date, :bidded_days, :signed_date, :signed_department_id, :service_years, :service_start_time, :service_end_time, :funding_source, :signed_clazz)
     end
 
     def product_up_params
       params.permit(:name, :item_clazz, :brand, :specification, :unit, :param, :source_method, :supplier)
     end
+
+    def sales_detail_params
+      params.permit(:amount, :price, :total_price, :custom_clazz, :delivery_date, :product_catalog_id, :business_id)
+    end
+    
   end
 end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -391,7 +391,7 @@ module EducodeSales
           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[计划投标额 实际中标额]
+          sale_names = %w[计划投标额 计划投标额累计 实际中标额 实际中标额累计]
           case @forecast_count_range
           when "week"
             # 年初第一天周数是0会导致周数重复计算

data/app/controllers/educode_sales/sales_details_controller.rb

@@ -0,0 +1,141 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class SalesDetailsController < ApplicationController
+
+    def index
+      respond_to do |format|
+        format.html do
+          common = Common.find_by(clazz: 'staff_type', name: '销售')
+          staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11)
+          @staffs = staffs.map { |d| [d.user.real_name, d.id]}
+          gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
+          gon.staffs = staffs.map { |d| {name: d.user.real_name, value: d.id } }
+
+          bussiness_type = []
+          if params[:type]
+            # 项目类型
+            bussiness_type = EducodeSales::Business.include_types(params[:type]) || []
+          end
+
+          business_step = []
+          if params[:step]
+            # 项目阶段
+            business_step = EducodeSales::Business.include_steps(params[:step]) || []
+          end
+
+
+          gon.business_type = Common.where(clazz: 'business_type').map do |d|
+            {value: d.id, name: d.name, selected: bussiness_type.include?(d.extras)}
+          end
+
+          gon.business_step = Common.where(clazz: 'business_step', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).order("position").map do |d|
+            {value: d.id, name: d.name, selected: business_step.include?(d.name)}
+          end
+        end
+        format.json do
+          @sales_details = SalesDetail
+          @sales_details = @sales_details.joins(:business).includes(:business, :product_catalog)
+
+          if params[:q] && params[:q][:signed_date].present?
+            date = params[:q][:signed_date].split(" - ")
+            @sales_details = @sales_details.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?", date[0], date[1])
+          end
+
+          if params[:q] && params[:q][:bidded_date].present?
+            date = params[:q][:bidded_date].split(" - ")
+            @sales_details = @sales_details.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", date[0], date[1])
+          end
+
+          if params[:q].present? && params[:q][:name].present?
+            @sales_details = @sales_details.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
+          end
+
+          if params[:sort].present? && params[:sort][:field]
+            @sales_details = @sales_details.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @sales_details = @sales_details.order("educode_sales_sales_details.created_at desc")
+          end
+
+          if params[:q].present? && params[:q][:business_step].present?
+            @sales_details = @sales_details.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id in (?)", params[:q][:business_step].split(",").map(&:to_i))
+          end
+
+
+          if params[:q].present? && params[:q][:sales_staff_id].present?
+            # 销售经理
+            @sales_details = @sales_details.joins("LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = educode_sales_businesses.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 = ?)", params[:q][:sales_staff_id], params[:q][:sales_staff_id])
+
+          end
+
+          if params[:q].present? && params[:q][:department].present?
+            departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:q][:department]}%").pluck(:id)
+            @sales_details = @sales_details.joins(business: :department).where("departments.id in (?)", departments_ids)
+          end
+
+          if params[:q].present? && params[:q][:area].present?
+            area = EducodeSales::Common.find(params[:q][:area]).name
+            if @current_admin.is_admin?
+              @sales_details = @sales_details.joins("
+                JOIN departments ON educode_sales_businesses.department_id = departments.id
+                JOIN schools ON departments.school_id = schools.id
+              ").where("province = ?", area)
+            else
+              level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
+              if level == "区域"
+                  @sales_details = @sales_details.joins("
+                    JOIN schools ON departments.school_id = schools.id
+                  ").where("province = ?", area)
+              else
+                @sales_details = @sales_details.joins("
+                  JOIN departments ON educode_sales_businesses.department_id = departments.id
+                  JOIN schools ON departments.school_id = schools.id
+                ").where("province = ?", area)
+              end
+            end
+          end
+  
+          @sales_details = @sales_details.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def destroy
+      sales_detail = SalesDetail.find(params[:id])
+      if sales_detail.destroy
+        render_success
+      else
+        render_failure sales_detail
+      end
+    end
+
+    def edit
+      @sale_detail = SalesDetail.find(params[:id])
+      @name = [@sale_detail.business.name, @sale_detail.product_catalog.item_clazz, @sale_detail.product_catalog.brand, @sale_detail.product_catalog.specification, @sale_detail.product_catalog.unit, @sale_detail.product_catalog.source_method, @sale_detail.product_catalog.param, @sale_detail.product_catalog.supplier].join(" ")
+      render layout: false
+    end
+
+    def update
+      sale_detail = SalesDetail.find(params[:id])
+      if sale_detail.update(sales_detail_params)
+        render_success
+      else
+        render_failure sale_detail
+      end
+    end
+
+    private
+
+    def sales_detail_params
+      params.permit(:amount, :price, :total_price, :custom_clazz, :delivery_date, :product_catalog_id)
+    end
+
+  end
+end

data/app/helpers/educode_sales/sale_trends_helper.rb

@@ -1,45 +1,58 @@
 module EducodeSales
   module SaleTrendsHelper
-
+    NAMES = %w[计划投标额 计划投标额累计 实际中标额 实际中标额累计]
     def goal_forecast_quarter(labels, selects, staff_id = nil)
       plan_get = plan_get(staff_id, labels, "quarter")
       actual_get = actual_get(staff_id, labels, "quarter")
-      datasets = selects.map do |select|
-        if select == "计划投标额"
-          {
-            label: select,
-            data: labels.map do |d|
-              quarter = d.split("-").last.to_i
-              year = d.split("-").first.to_i
-              plan_get[[year, quarter]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
-            end,
-            backgroundColor: [
-              'rgba(255, 99, 132, 0.2)',
-            ],
-            borderColor: [
-              'rgba(255,99,132,1)',
-            ],
-            borderWidth: 1
-          }
-        else
-          {
-            label: select,
-            data: labels.map do |d|
-              quarter = d.split("-").last.to_i
-              year = d.split("-").first.to_i
-              actual_get[[year, quarter]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
-            end,
-            backgroundColor: [
-              'rgba(54, 162, 235, 0.2)',
-            ],
-            borderColor: [
-              'rgba(54, 162, 235, 1)',
-            ],
-            borderWidth: 1
-          }
-        end
+      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[[year, quarter]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+               elsif select == NAMES[1]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_get[[year, quarter]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+                 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[[year, quarter]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+               elsif select == NAMES[3]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_get[[year, quarter]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+                 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,
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
       end
-
       {
         labels: labels,
         datasets: datasets
@@ -50,42 +63,58 @@ module EducodeSales
 
       plan_get = plan_get(staff_id, labels, "week")
       actual_get = actual_get(staff_id, labels, "week")
-      datasets = selects.map do |select|
-        if select == "计划投标额"
-          {
-            label: select,
-            data: labels.map do |d|
-              week = d.split("-").last
-              year = d.split("-").first
-              yearweek = "#{year}#{week}".to_i
-              plan_get[yearweek].to_f
-            end,
-            backgroundColor: [
-              'rgba(255, 99, 132, 0.2)',
-            ],
-            borderColor: [
-              'rgba(255,99,132,1)',
-            ],
-            borderWidth: 1
-          }
-        else
-          {
-            label: select,
-            data: labels.map do |d|
-              week = d.split("-").last
-              year = d.split("-").first
-              yearweek = "#{year}#{week}".to_i
-              actual_get[yearweek].to_f
-            end,
-            backgroundColor: [
-              'rgba(54, 162, 235, 0.2)',
-            ],
-            borderColor: [
-              'rgba(54, 162, 235, 1)',
-            ],
-            borderWidth: 1
-          }
-        end
+      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[yearweek].to_f
+                 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[yearweek].to_f
+                 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[yearweek].to_f
+                 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[yearweek].to_f
+                 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,
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
       end
 
       {
@@ -97,40 +126,55 @@ module EducodeSales
     def goal_forecast_month(labels, selects, staff_id = nil)
       plan_get = plan_get(staff_id, labels, "month")
       actual_get = actual_get(staff_id, labels, "month")
-      datasets = selects.map do |select|
-        if select == "计划投标额"
-          {
-            label: select,
-            data: labels.map do |d|
-              month = d.split("-").last.to_i
-              year = d.split("-").first.to_i
-              plan_get[[year, month]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
-            end,
-            backgroundColor: [
-              'rgba(255, 99, 132, 0.2)',
-            ],
-            borderColor: [
-              'rgba(255,99,132,1)',
-            ],
-            borderWidth: 1
-          }
-        else
-          {
-            label: select,
-            data: labels.map do |d|
-              month = d.split("-").last.to_i
-              year = d.split("-").first.to_i
-              actual_get[[year, month]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
-            end,
-            backgroundColor: [
-              'rgba(54, 162, 235, 0.2)',
-            ],
-            borderColor: [
-              'rgba(54, 162, 235, 1)',
-            ],
-            borderWidth: 1
-          }
-        end
+      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[[year, month]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+               elsif select == NAMES[1]
+                 arr = labels.map do |d|
+                   month = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_get[[year, month]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+                 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[[year, month]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+               elsif select == NAMES[3]
+                 arr = labels.map do |d|
+                   month = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_get[[year, month]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+                 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,
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
       end
 
       {
@@ -142,34 +186,40 @@ module EducodeSales
     def goal_forecast_year(labels, selects, staff_id = nil)
       plan_get = plan_get(staff_id, labels, "year")
       actual_get = actual_get(staff_id, labels, "year")
-      datasets = selects.map do |select|
-        if select == "计划投标额"
-          {
-            label: select,
-            data: labels.map { |d| plan_get[d.to_i] || 0 },
-            backgroundColor: [
-              'rgba(255, 99, 132, 0.2)',
-            ],
-            borderColor: [
-              'rgba(255,99,132,1)',
-            ],
-            borderWidth: 1
-          }
-        else
-          {
-            label: select,
-            data: labels.map { |d| actual_get[d.to_i] || 0 },
-            backgroundColor: [
-              'rgba(54, 162, 235, 0.2)',
-            ],
-            borderColor: [
-              'rgba(54, 162, 235, 1)',
-            ],
-            borderWidth: 1
-          }
-        end
-      end
+      datasets = selects.map.with_index do |select, i|
+        data = if select == NAMES[0]
+                 labels.map { |d| plan_get[d.to_i] || 0 }
+               elsif select == NAMES[1]
+                 arr = labels.map { |d| plan_get[d.to_i] || 0 }
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == NAMES[2]
+                 labels.map { |d| actual_get[d.to_i] || 0 }
+               elsif select == NAMES[3]
+                 arr = labels.map { |d| actual_get[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,
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
+      end
       {
         labels: labels,
         datasets: datasets
@@ -180,9 +230,29 @@ module EducodeSales
 
     def plan_get(staff_id, time_range, type)
       # 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 <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", time_range.first, time_range.last)
+                     .where("educode_sales_follow_ups.invitation_at >= ? and educode_sales_follow_ups.invitation_at <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", start_time, end_time)
       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)").sum(:budget_amount)
@@ -198,10 +268,30 @@ module EducodeSales
     end
 
     def actual_get(staff_id, time_range, type)
+      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 <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", time_range.first, time_range.last)
+                     .where("educode_sales_follow_ups.bidded_date >= ? and educode_sales_follow_ups.bidded_date <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", start_time, end_time)
       case type
       when "week"
         data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.bidded_date) as week").group("yearweek(educode_sales_follow_ups.bidded_date)").sum(:actual_amount)

data/app/models/educode_sales/follow_up.rb

@@ -10,6 +10,8 @@ module EducodeSales
 
     InfoClazz = ['跟进信息', '建议信息', '评论信息', '审核信息']
 
+    enum signed_clazz: ['直签', '代签', '总集', '渠道']
+
     enum funding_source: ['贷款资金', '财政资金', '自由资金']
 
     include ::Deletable

data/app/models/educode_sales/sale_trend.rb

@@ -2,12 +2,12 @@ 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)', 
+      '#44D7B6', '#7CFC00', '#4CACFF', "#110FD7", '#F7B500', '#48D1CC', '#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)', '#A2D9CE', '#D6EAF8', '#E8DAEF', '#FADBD8',
       '#F5B7B1', '#E6B0AA', '#FCF3CF', '#FDEBD0', '#F6DDCC', '#D98880', '#EC7063', '#A569BD', '#85C1E9', '#45B39D', '#F7DC6F',
       '#DC7633', '#839192', '#6C3483', '#B03A2E', '#7B7D7D', '#4D5656', '#28B463', '#0E6655', '#F39C12', '#0E6251', '#1B4F72',
-      '#FAE5D3', '#82E0AA', '#FF00FF', '#663399', '#4B0082', '#7CFC00', '#48D1CC'
+      '#FAE5D3', '#82E0AA', '#FF00FF', '#663399', '#4B0082', '#7CFC00'
     ]
   end
 end