educode_sales 0.5.0 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c77c9d72b776a5250acf438fad00e27b871430b26bdf994a93d1189e0aaba14
-  data.tar.gz: 6ea39f9c64190ccec5427668596827663e702ddd5a0e0d8c0fa5cace8931d1ba
+  metadata.gz: 660c43183c6a1edf9d5aab4b549bce9d2b68edf789010d85379198372be1a120
+  data.tar.gz: 28beeb3a7026076f4e6da6dc966bf75523e7be06717b787041d2e14500902532
 SHA512:
-  metadata.gz: 842442865a01e90e7aa227fd5f0b33fd994d509b9d1bad0bff8fe3ebfe59d818fd48b05fcef54c665504d0f5b0a0ec70c2efaccbdc5c017269ef507565866073
-  data.tar.gz: 365f1987a2fe002df56e11f72ba6456c1c15fefa880b06001dce1b4ae4ee1f95a92fae61b5afb3ff28c2ba51c04309b7d06f05067effee9f8aa8e618d0d38eae
+  metadata.gz: d7f6b1515f819aac77b135ba6d52a3562c4fef76d650fd1a74c44bf3dcaffacc41ec34e1623337538a36bf40cff2591d14d40e83575cd7920a69fcfadb5662c4
+  data.tar.gz: ff102c87e89e482809f4b8e84e0f27c5f42a3dd22863f6ebfe0a4fd115eae1d026de70cd738c5b0d83e9e3ab78aee3a276eb0fed4f6a66c467ab8926c7737ed2

data/app/controllers/educode_sales/businesses_controller.rb

@@ -4,7 +4,7 @@ module EducodeSales
   class BusinessesController < ApplicationController
 
     def file
-      @root = Rails.root
+      gon.folder = edu_setting('attachment_folder') + '/'
       render layout: false
     end
     def upload_file
@@ -82,15 +82,17 @@ module EducodeSales
           end
 
           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已中标商机)"
+            stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
             @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
-            ").where("educode_sales_follow_ups.bidded_date > ? AND educode_sales_follow_ups.bidded_date < ?", "#{@year}-01-01", "#{@year}-12-31")
+            ").where("educode_sales_follow_ups.bidded_date > ? AND educode_sales_follow_ups.bidded_date < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids)
           end
 
           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已签单商机)"
+            s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
             @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
-            ").where("educode_sales_follow_ups.signed_date > ? AND educode_sales_follow_ups.signed_date < ?", "#{@year}-01-01", "#{@year}-12-31")
+            ").where("educode_sales_follow_ups.signed_date > ? AND educode_sales_follow_ups.signed_date < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids)
           end
 
           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已回款商机)"
@@ -122,10 +124,10 @@ module EducodeSales
             @businesses = @businesses.joins(:department).where("departments.id in (?)", departments_ids)
           end
           if params[:q].present? && params[:q][:staff_id].present?
-            part_a_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is null AND staff_id = ?",params[:q][:staff_id]).ids
+            part_a_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is null AND educode_sales_businesses.staff_id = ?",params[:q][:staff_id]).ids
             part_b_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is not null").joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
-            ").where("educode_sales_follow_ups.staff_id = ?", params[:q][:staff_id]).pluck(:business_id)
+            ").where("educode_sales_follow_ups.staff_id = ?", params[:q][:staff_id]).ids
             business_ids = part_a_ids + part_b_ids
             @businesses = EducodeSales::Business.where(id:business_ids)
           end
@@ -172,6 +174,8 @@ module EducodeSales
             educode_sales_businesses.*,
             last_follow.invitation_at,
             last_follow.reception_at,
+            last_follow.bidded_date,
+            last_follow.signed_date,
             last_follow.total_amount").joins("
             LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
           ").page(params[:page]).per(params[:limit])
@@ -221,7 +225,7 @@ module EducodeSales
 
     def destroy
       business = Business.find(params[:id])
-      business.destroy
+      business.soft_destroy(@current_admin.id)
       render_success
     rescue ActiveRecord::DeleteRestrictionError => e
       render_failure '该商机已其它关联数据产生，暂不能删除'
@@ -315,5 +319,8 @@ module EducodeSales
       params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id)
     end
 
+    def edu_setting name
+      EduSetting.get(name)
+    end
   end
 end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -36,7 +36,7 @@ module EducodeSales
     def destroy
       follow_up = FollowUp.find(params[:id])
       business = follow_up.business
-      if follow_up.destroy
+      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))
         end
@@ -132,7 +132,8 @@ module EducodeSales
         )
         teacher.save
         key_peprson = KeyPerson.new(teacher_params)
-        key_peprson.teacher = teacher
+        teacher_id = EducodeSales::Teacher.find_by(name: user.real_name, department_id: user.department_id).id
+        key_peprson.teacher_id = teacher_id
       end
 
       follow_up.key_person << key_peprson

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -78,7 +78,17 @@ module EducodeSales
     end
 
     def new_weekly
-      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      d = @current_admin
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       @name = @current_admin.user.real_name
       sale_plans = OperationPlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", weekly: Time.now.strftime('%W').to_i, staff_id: @current_admin.id)
       @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
@@ -95,7 +105,17 @@ module EducodeSales
     end
 
     def new_monthly
-      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      d = @current_admin
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       @name = @current_admin.user.real_name
       sale_plans = OperationPlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", staff_id: @current_admin.id, weekly: nil)
       @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0

data/app/controllers/educode_sales/operation_reports_controller.rb

@@ -68,7 +68,17 @@ module EducodeSales
     def show
       @sale_report = OperationReport.find(params[:id])
       @name = @sale_report.staff.user.real_name
-      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 
@@ -81,7 +91,17 @@ module EducodeSales
     def edit
       @sale_report = OperationReport.find(params[:id])
       @name = @sale_report.staff.user.real_name
-      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 
@@ -118,7 +138,17 @@ module EducodeSales
     def audit
       @sale_report = OperationReport.find(params[:id])
       @name = @sale_report.staff.user.real_name
-      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 

data/app/controllers/educode_sales/plans_controller.rb

@@ -86,7 +86,17 @@ module EducodeSales
     end
 
     def new_weekly
-      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      d = @current_admin
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       @name = @current_admin.user.real_name
       sale_plans = SalePlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", weekly: Time.now.strftime('%W').to_i, staff_id: @current_admin.id)
       @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
@@ -104,7 +114,17 @@ module EducodeSales
     end
 
     def new_monthly
-      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      d = @current_admin
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       @name = @current_admin.user.real_name
       sale_plans = SalePlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", staff_id: @current_admin.id, weekly: nil)
       @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
@@ -175,7 +195,7 @@ module EducodeSales
 
     def destroy
       sale_plan = SalePlan.find(params[:id])
-      if sale_plan.destroy
+      if sale_plan.soft_destroy(@current_admin.id)
         render_success
       else
         render_failure sale_plan

data/app/controllers/educode_sales/recycles_controller.rb

@@ -0,0 +1,95 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class RecyclesController < ApplicationController
+
+    def destroy
+      @recycle = Recycle.find(params[:id])
+      @recycle.destroy
+      render_success
+    end
+
+
+
+    def restore_reports
+      @recycle = Recycle.find(params[:id])
+      report_id = @recycle.source_id
+      EducodeSales::SaleReport.unscoped.find(report_id).update(deleted_at: nil)
+      @recycle.destroy
+      render_success
+    end
+
+    def restore_plans
+      @recycle = Recycle.find(params[:id])
+      plan = EducodeSales::SalePlan.unscoped.find(@recycle.source_id)
+      business = EducodeSales::Business.unscoped.find(plan.business_id)
+      Recycle.find_by(source_id: business.id).destroy if Recycle.find_by(source_id: business.id).present?
+      business.update(deleted_at: nil)
+      follow_ups = EducodeSales::FollowUp.unscoped.where(business_id: business.id)
+      follow_ups.update_all(deleted_at: nil)
+      plan.update(deleted_at: nil)
+      @recycle.destroy
+      render_success
+    end
+
+    def restore_businesses
+      @recycle = Recycle.find(params[:id])
+      business_id = @recycle.source_id
+      EducodeSales::Business.unscoped.find(business_id).update(deleted_at: nil)
+      follow_ups = EducodeSales::FollowUp.unscoped.where(business_id: business_id)
+      follow_ups.update_all(deleted_at: nil)
+      @recycle.destroy
+      render_success
+    end
+
+    def business
+      @businesses = Recycle.where(source_type:"EducodeSales::Business")
+      if params[:sort].present? && params[:sort][:field]
+        @businesses = @businesses.order("created_at #{params[:sort][:order]}")
+      else
+        @businesses = @businesses.order("educode_sales_recycles.created_at desc")
+      end
+      @businesses = @businesses.page(params[:page]).per(params[:limit])
+    end
+
+    def weekly
+      @weekly = Recycle.where(source_type:"EducodeSales::SaleReport").order(created_at: :desc).page(params[:page]).per(params[:limit])
+      if params[:sort].present? && params[:sort][:field]
+        @weekly = @weekly.order("created_at #{params[:sort][:order]}")
+      else
+        @weekly = @weekly.order("educode_sales_recycles.created_at desc")
+      end
+      @weekly = @weekly.page(params[:page]).per(params[:limit])
+    end
+
+    def monthly
+      @monthly = Recycle.where(source_type:"EducodeSales::SaleReport")
+      if params[:sort].present? && params[:sort][:field]
+        @monthly = @monthly.order("created_at #{params[:sort][:order]}")
+      else
+        @monthly = @monthly.order("educode_sales_recycles.created_at desc")
+      end
+      @monthly = @monthly.page(params[:page]).per(params[:limit])
+    end
+
+    def weekPlan
+      @weekPlans = Recycle.where(source_type:"EducodeSales::SalePlan")
+      if params[:sort].present? && params[:sort][:field]
+        @weekPlans = @weekPlans.order("created_at #{params[:sort][:order]}")
+      else
+        @weekPlans = @weekPlans.order("educode_sales_recycles.created_at desc")
+      end
+      @weekPlans = @weekPlans.page(params[:page]).per(params[:limit])
+    end
+
+    def monthPlan
+      @monthPlans = Recycle.where(source_type:"EducodeSales::SalePlan")
+      if params[:sort].present? && params[:sort][:field]
+        @monthPlans = @monthPlans.order("created_at #{params[:sort][:order]}")
+      else
+        @monthPlans = @monthPlans.order("educode_sales_recycles.created_at desc")
+      end
+      @monthPlans = @monthPlans.page(params[:page]).per(params[:limit])
+    end
+end
+end

data/app/controllers/educode_sales/roles_controller.rb

@@ -35,6 +35,11 @@ module EducodeSales
       render layout: false
     end
 
+    def rename
+      @name = Role.find(params[:id]).name
+      render layout: false
+    end
+
     def update_role
       role = Role.find(params[:id])
       if role.update(name: params[:name])

data/app/controllers/educode_sales/sale_reports_controller.rb

@@ -24,13 +24,23 @@ module EducodeSales
     def show
       @sale_report = SaleReport.find(params[:id])
       @name = @sale_report.staff.user.real_name
-      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 
     def destroy
       sale_report = SaleReport.find(params[:id])
-      if sale_report.destroy
+      if sale_report.soft_destroy(@current_admin.id)
         render_success
       else
         render_failure sale_report
@@ -86,7 +96,17 @@ module EducodeSales
     def edit
       @sale_report = SaleReport.find(params[:id])
       @name = @sale_report.staff.user.real_name
-      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 
@@ -123,7 +143,17 @@ module EducodeSales
     def audit
       @sale_report = SaleReport.find(params[:id])
       @name = @sale_report.staff.user.real_name
-      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -23,6 +23,124 @@ module EducodeSales
       @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).sum(:total_amount).round(2)
       b = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name).pluck(:id)
       @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", b).sum(:total_amount).round(2)
+
+      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 = (7.day.ago.to_date..Date.today).to_a #默认时间范围
+      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)']
+      @follow_count_range = params[:follow_count_range] || "day"
+      @goal_count_range = params[:goal_count_range] || "day"
+      # 商机跟进数图表
+      @follow_count_data = day_follow_count_chart(default_dates,names,x_business_ids,colors)
+      if params[:follow_count_range].present?
+        case params[:follow_count_range]
+        when "week"
+        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)
+          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
+        end
+      end
+
+
+      # 已中标图表
+      goal_default_dates = ("#{Time.now.year}-01".."#{Time.now.year}-#{Time.now.month}").to_a
+      sale_names = ['已中标','已签单','已回款']
+       @goal_count_data =
+      {
+        labels: goal_default_dates,
+        datasets: sale_names.map do |name|{
+                     label: name,
+                     data: goal_default_dates.map{ |d|
+                       case sale_names.index(name)
+                       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(:total_amount).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(:total_amount).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[sale_names.index(name)],
+                     borderColor: colors[sale_names.index(name)],
+                     borderWidth: 1
+                   }
+        end
+      }
+      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 =  {
+              labels: dates,
+              datasets: sale_names.map do |name|{
+                           label: name,
+                           data: dates.map{ |d|
+                             case sale_names.index(name)
+                             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(:total_amount).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(:total_amount).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[sale_names.index(name)],
+                           borderColor: colors[sale_names.index(name)],
+                           borderWidth: 1
+                         }
+              end
+            }
+          end
+          else   #按年
+          if params[:goal_date_year].present?
+            date = params[:goal_date_year].split(" - ")
+            dates = (date[0]..date[1]).to_a
+            @goal_count_data =  {
+              labels: dates,
+              datasets:sale_names.map do |name| {
+                           label: name,
+                           data: dates.map{ |d|
+                             case sale_names.index(name)
+                             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(:total_amount).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(:total_amount).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[sale_names.index(name)],
+                           borderColor: colors[sale_names.index(name)],
+                           borderWidth: 1
+                         }
+              end
+            }
+          end
+        end
+      end
     end
 
     def sale_trends
@@ -44,5 +162,58 @@ module EducodeSales
       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 do |name|
+          {
+            hidden: names.index(name) < 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 },
+            backgroundColor: "#fff",
+            pointBorderColor: colors[names.index(name)%15],
+            borderColor: colors[names.index(name)%15],
+            pointBackgroundColor: colors[names.index(name)%15],
+            borderWidth: 4
+          }
+        end
+      }
+    end
+    def month_follow_count_chart(dates,names,x_business_ids,colors)
+      {
+        labels: dates,
+        datasets:names.map do |name|
+          {
+            hidden: names.index(name) < 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 },
+            backgroundColor: "#fff",
+            pointBorderColor: colors[names.index(name)%15],
+            borderColor: colors[names.index(name)%15],
+            pointBackgroundColor: colors[names.index(name)%15],
+            borderWidth: 4,
+          }
+        end
+      }
+    end
+    def year_follow_count_chart(dates,names,x_business_ids,colors)
+      {
+        labels: dates,
+        datasets:names.map do |name|
+          {
+            hidden: names.index(name) < 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 },
+            backgroundColor: "#fff",
+            pointBorderColor: colors[names.index(name)%15],
+            borderColor: colors[names.index(name)%15],
+            pointBackgroundColor: colors[names.index(name)%15],
+            borderWidth: 4
+          }
+        end
+      }
+    end
+
+
   end
 end

data/app/controllers/educode_sales/sales_controller.rb

@@ -14,6 +14,10 @@ module EducodeSales
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           @a_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name)
           @b_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name)
+          @c_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::CTYPE)&.name)
+          @d_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::DTYPE)&.name)
+          @e_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::ETYPE)&.name)
+          @o_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::OTYPE)&.name)
           @x = Common.find_by(extras: EducodeSales::Common::XTYPE)
           @step_ids = Common.where(name: %w(已中标 已签单 已验收 回款中 服务中 已结束), clazz: 'business_step').pluck(:id)
           

data/app/controllers/educode_sales/staffs_controller.rb

@@ -8,7 +8,7 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @staffs = Staff.where(is_admin: false).page(params[:page]).per(params[:limit])
+          @staffs = Staff.where(is_admin: false, deleted_at: nil).page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -37,10 +37,10 @@ module EducodeSales
 
     def destroy
       staff = Staff.find(params[:id])
-      staff.destroy
+      staff.update(deleted_at: Time.now, expired_at: Time.now.days_ago(1))
       render_success
-    rescue ActiveRecord::DeleteRestrictionError => e
-      render_failure '该用户已有数据产生，暂不能删除'
+    # rescue ActiveRecord::DeleteRestrictionError => e
+    #   render_failure '该用户已有数据产生，暂不能删除'
     end
 
     def disable