educode_sales 0.5.4 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 660c43183c6a1edf9d5aab4b549bce9d2b68edf789010d85379198372be1a120
-  data.tar.gz: 28beeb3a7026076f4e6da6dc966bf75523e7be06717b787041d2e14500902532
+  metadata.gz: cb7ba8647915177726d6f9f525ea700b0e7ca469bf8ff7460d27a8d3e5204c28
+  data.tar.gz: d56bb7b39f7f44dc59b2d733ae60af4d3aee9135f8ee60e0721a5723bf20fc7a
 SHA512:
-  metadata.gz: d7f6b1515f819aac77b135ba6d52a3562c4fef76d650fd1a74c44bf3dcaffacc41ec34e1623337538a36bf40cff2591d14d40e83575cd7920a69fcfadb5662c4
-  data.tar.gz: ff102c87e89e482809f4b8e84e0f27c5f42a3dd22863f6ebfe0a4fd115eae1d026de70cd738c5b0d83e9e3ab78aee3a276eb0fed4f6a66c467ab8926c7737ed2
+  metadata.gz: 7b2d57743dbf47151f106931393b6e4e9671a8bba6b8393e3769954ddb8a82cb914c85ee926c16595ec546f2e7826a569590d6d9589d12d67d0858a77c2effc6
+  data.tar.gz: 96d8209f672ee5118f30da45bb672db2139f9890148c0bfff46873df59329d8aa5b1c9e1763e7c063048e994f03399706fd8e850a8502e8cd8d08bcae3e44dc0

data/app/controllers/educode_sales/businesses_controller.rb

@@ -149,10 +149,24 @@ module EducodeSales
 
           if params[:q].present? && params[:q][:area].present?
             p = EducodeSales::Common.find(params[:q][:area]).name
-            @businesses = @businesses.joins("
+            if @current_admin.is_admin?
+              @businesses = @businesses.joins("
+              JOIN departments ON educode_sales_businesses.department_id = departments.id
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+            else
+              level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
+              if level == "区域"
+                @businesses = @businesses.joins("
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+              else
+                @businesses = @businesses.joins("
               JOIN departments ON educode_sales_businesses.department_id = departments.id
               JOIN schools ON departments.school_id = schools.id
             ").where("province = ?", p)
+              end
+            end
           end
 
           if params[:q].present? && params[:q][:date].present?
@@ -176,6 +190,7 @@ module EducodeSales
             last_follow.reception_at,
             last_follow.bidded_date,
             last_follow.signed_date,
+            last_follow.actual_amount,
             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])
@@ -260,6 +275,7 @@ module EducodeSales
 
     def new_follow_record
       load_business
+      @years = (2015..Time.now.year).to_a.reverse
       @o_name = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.name
       @clazz = Common.where(clazz: 'business_type').order("position").pluck(:name, :id)
       @stages = Common.where(clazz: 'business_step').order("position").pluck(:name, :id)
@@ -269,6 +285,7 @@ module EducodeSales
         gon.sales = @last_follow_up.assign_follow_ups.map do |d|
           {value: d.staff_id, name: d.staff.user.full_name}
         end
+        gon.place = @last_follow_up.place.present? ? [{ value: @last_follow_up.place&.id, name: @last_follow_up.place&.name }] : []
       end
       render layout: false
     end
@@ -294,6 +311,7 @@ module EducodeSales
     end
 
     def edit_follow_record
+      @years = (2015..Time.now.year).to_a.reverse
       @o_name = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.name
       @follow_up = FollowUp.find(params[:follow_up_id])
       @clazz = Common.where(clazz: 'business_type').order("position").pluck(:name, :id)
@@ -302,6 +320,7 @@ module EducodeSales
       gon.sales = @follow_up.assign_follow_ups.map do |d|
         {value: d.staff_id, name: d.staff.user.full_name}
       end
+      gon.place = @follow_up.place.present? ? [{ value: @follow_up.place&.id, name: @follow_up.place&.name }] : [value: '', name: '']
       render layout: false
     end
 

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -3,6 +3,63 @@ require_dependency "educode_sales/application_controller"
 module EducodeSales
   class FollowUpsController < ApplicationController
 
+    def index
+      authorize! :read, Business
+      respond_to do |format|
+        format.html do
+        end
+        format.json do
+          if @current_admin.is_admin?
+            @follow_ups = FollowUp.all
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
+            case level
+            when '自己'
+              business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
+              @businesses = Business.where("educode_sales_businesses.staff_id = ? OR educode_sales_businesses.id in (?)", @current_admin.id, business_ids)
+              business_ids = @businesses.pluck(:id)
+              @follow_ups = FollowUp.where(business_id: business_ids)
+            when '区域'
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+              business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
+              @businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}  OR educode_sales_businesses.id in (?)", school_ids, business_ids)
+              business_ids = @businesses.pluck(:id)
+              @follow_ups = FollowUp.where(business_id: business_ids)
+            else
+              @follow_ups = FollowUp.all
+            end
+          end
+          if params[:q].present? && params[:q][:name].present?
+            @follow_ups = @follow_ups.joins(:business).where("educode_sales_businesses.name LIKE ?", "%#{params[:q][:name]}%")
+          end
+          if params[:q].present? && params[:q][:follows_date].present?
+            date = params[:q][:follows_date].split(" - ")
+            @follow_ups = @follow_ups.where("educode_sales_follow_ups.created_at > ? AND educode_sales_follow_ups.created_at < ?", date[0], date[1])
+          end
+          if params[:q].present? && params[:q][:staff_id].present?
+            @follow_ups = @follow_ups.where(staff_id: params[:q][: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)
+            @follow_ups = @follow_ups.joins(business: :department).where("departments.id in (?)", departments_ids)
+          end
+          if params[:q].present? && params[:q][:area].present?
+            p = EducodeSales::Common.find(params[:q][:area]).name
+            @follow_ups = @follow_ups.joins(:business).joins("
+              JOIN departments ON educode_sales_businesses.department_id = departments.id
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+          end
+          if params[:sort].present? && params[:sort][:field]
+            @follow_ups = @follow_ups.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @follow_ups = @follow_ups.order("educode_sales_follow_ups.created_at desc")
+          end
+          @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
+        end
+    end
+    end
+
     def create
       load_business
       follow_up = @business.follow_ups.build(follow_up_params)
@@ -157,7 +214,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id, :bidded_date, :signed_date)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year)
     end
 
     def teacher_params

data/app/controllers/educode_sales/home_controller.rb

@@ -42,12 +42,28 @@ module EducodeSales
     end
 
     def sales_staff
-      common = Common.find_by(clazz: 'staff_type', name: '销售')
       @staffs = Staff
+      if params[:teacher_assist].present?
+        common = Common.find_by(clazz: 'staff_type', name: '运营')
+      else
+        common = Common.find_by(clazz: 'staff_type', name: '销售')
+      end
       if params[:q].present?
         @staffs = @staffs.joins(user: :user_extension).where("concat(lastname, firstname) like :q", q: "%#{params[:q]}%")
       end
-      @staffs = @staffs.where(is_admin: false).where.not(id: @current_admin.id).where(job_type: common.id).page(params[:page]).per(10)
+      if params[:teacher_assist].present?
+        @staffs = @staffs.where(is_admin: false).where(job_type: common.id).page(params[:page]).per(10)
+      else
+        @staffs = @staffs.where(is_admin: false).where.not(id: @current_admin.id).where(job_type: common.id).page(params[:page]).per(10)
+      end
+    end
+
+    def sales_place
+      @places = EducodeSales::Place
+      if params[:q].present?
+        @places = @places.where("name like :q", q: "%#{params[:q].strip}%")
+      end
+      @places = @places.page(params[:page]).per(10)
     end
 
   end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -16,31 +16,40 @@ module EducodeSales
       @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).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)
       @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).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)
 
+      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 = (7.day.ago.to_date..Date.today).to_a #默认时间范围
+      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)']
-      @follow_count_range = params[:follow_count_range] || "day"
-      @goal_count_range = params[:goal_count_range] || "day"
+      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 = day_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)
+          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
@@ -67,27 +76,7 @@ module EducodeSales
       # 已中标图表
       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
-      }
+       @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"
@@ -95,49 +84,13 @@ module EducodeSales
           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
-            }
+            @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 =  {
-              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
-            }
+            @goal_count_data = year_sale_chart(dates,sale_names,colors,x,stage_ids,s_stage_ids,count_type)
           end
         end
       end
@@ -165,16 +118,53 @@ module EducodeSales
     def day_follow_count_chart(dates,names,x_business_ids,colors)
       {
         labels: dates,
-        datasets:names.map do |name|
+        datasets:names.map.with_index do |name,i|
           {
-            hidden: names.index(name) < 3 ? false : true,
+            # 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 },
             backgroundColor: "#fff",
-            pointBorderColor: colors[names.index(name)%15],
-            borderColor: colors[names.index(name)%15],
-            pointBackgroundColor: colors[names.index(name)%15],
-            borderWidth: 4
+            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)
+      {
+        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],
+        datasets:names.map.with_index do |name,i|
+          {
+            # hidden: i < 3 ? false : true,
+            label: name[0],
+            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],
+            backgroundColor: "#fff",
+            pointBorderColor: colors[i%15+1],
+            borderColor: colors[i%15+1],
+            pointBackgroundColor: colors[i%15+1],
+            borderWidth: 2
           }
         end
       }
@@ -182,16 +172,16 @@ module EducodeSales
     def month_follow_count_chart(dates,names,x_business_ids,colors)
       {
         labels: dates,
-        datasets:names.map do |name|
+        datasets:names.map.with_index do |name,i|
           {
-            hidden: names.index(name) < 3 ? false : true,
+            # 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 },
             backgroundColor: "#fff",
-            pointBorderColor: colors[names.index(name)%15],
-            borderColor: colors[names.index(name)%15],
-            pointBackgroundColor: colors[names.index(name)%15],
-            borderWidth: 4,
+            pointBorderColor: colors[i%15+1],
+            borderColor: colors[i%15+1],
+            pointBackgroundColor: colors[i%15+1],
+            borderWidth: 2,
           }
         end
       }
@@ -199,21 +189,66 @@ module EducodeSales
     def year_follow_count_chart(dates,names,x_business_ids,colors)
       {
         labels: dates,
-        datasets:names.map do |name|
+        datasets:names.map.with_index do |name,i|
           {
-            hidden: names.index(name) < 3 ? false : true,
+            # 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 },
             backgroundColor: "#fff",
-            pointBorderColor: colors[names.index(name)%15],
-            borderColor: colors[names.index(name)%15],
-            pointBackgroundColor: colors[names.index(name)%15],
-            borderWidth: 4
+            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)
+      {
+        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
+        }
+        end
+      }
+    end
+
+    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
+        }
+        end
+      }
+    end
+
 
   end
 end

data/app/controllers/educode_sales/sales_controller.rb

@@ -9,8 +9,11 @@ module EducodeSales
       authorize! :sales, Staff
       respond_to do |format|
         format.html do
+          @year = params[:year] ? params[:year] : "全部"
+          @years = ["全部"]+(2015..Time.now.year).to_a.reverse
         end
         format.json do
+          @year = params[:year] ? params[:year] : "全部"
           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)

data/app/controllers/educode_sales/teachers_controller.rb

@@ -21,6 +21,8 @@ module EducodeSales
     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).map { |d| [d.user.real_name, d.id]}
           @more = can?(:create, EducodeSales::OperationPlan) || can?(:update, EducodeSales::Teacher) || can?(:destroy, EducodeSales::Teacher)
           gon.menus = []
           if can?(:create, EducodeSales::OperationPlan)
@@ -43,14 +45,30 @@ module EducodeSales
             when '自己'
               @teachers = Teacher.where(is_key: false)
               @teachers = @teachers.where(staff_id: @current_admin.id)
+              teacher_ids = EducodeSales::Teacher.where(staff_id: 0).pluck(:id) - EducodeSales::TeacherAssignFollow.all.pluck(:Teacher_id) + EducodeSales::TeacherAssignFollow.where(staff_id: @current_admin.id).pluck(:teacher_id) + @teachers.ids
+              @teachers = Teacher.where(id: teacher_ids)
             when '区域'
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
               @teachers = Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where(is_key: false).where("departments.school_id in (?) OR educode_sales_teachers.staff_id = #{@current_admin.id}", school_ids)
+              teacher_ids = EducodeSales::Teacher.where(staff_id: 0).pluck(:id) - EducodeSales::TeacherAssignFollow.all.pluck(:Teacher_id) + EducodeSales::TeacherAssignFollow.where(staff_id: @current_admin.id).pluck(:teacher_id) + @teachers.ids
+              @teachers = Teacher.where(id: teacher_ids)
             else
               @teachers = Teacher.where(is_key: false)
             end
           end
-          
+
+          if @current_admin.job_type == Common.find_by(clazz: 'staff_type', name: '销售').id
+            public_teacher_ids = EducodeSales::Teacher.where(staff_id: 0).pluck(:id) - EducodeSales::TeacherAssignFollow.where(staff_id: @current_admin.id).pluck(:teacher_id)
+            @teachers = @teachers.where.not(id: public_teacher_ids)
+          end
+
+
+
+          if params[:q].present? && params[:q][:assist].present?
+            staff_id = params[:q][:assist].to_i
+            teacher_ids = EducodeSales::TeacherAssignFollow.where(staff_id: staff_id).pluck(:teacher_id)
+            @teachers = @teachers.where(id: teacher_ids)
+          end
           if params[:q].present? && params[:q][:name].present?
             @teachers = @teachers.where("educode_sales_teachers.name like ?", "%#{params[:q][:name]}%")
           end
@@ -60,6 +78,13 @@ module EducodeSales
           if params[:q].present? && params[:q][:regist_at].present?
             @teachers = @teachers.where("educode_sales_teachers.regist_at like ?", "%#{params[:q][:regist_at]}%")
           end
+          if params[:q].present? && params[:q][:status].present?
+            if params[:q][:status] == "1"
+              @teachers = @teachers.where("educode_sales_teachers.user_id is not null")
+            else
+              @teachers = @teachers.where("educode_sales_teachers.user_id is null")
+            end
+          end
           if params[:q].present? && params[:q][:attitude].present?
             # @teachers = @teachers.where("educode_sales_teachers.attitude_id = ?", "#{params[:q][:attitude]}")
             @teachers = @teachers.joins("
@@ -105,6 +130,9 @@ module EducodeSales
     def create
       department = Department.find(params[:department_id])
       teacher = @current_admin.teachers.build(teacher_params)
+      params[:teacher_assist].each do |d|
+        teacher.teacher_assign_follows.build(staff_id: d)
+      end
       teacher.department_id = department.id
       if params[:user_id].present?
         user = User.find(params[:user_id])
@@ -147,6 +175,13 @@ module EducodeSales
       teacher = Teacher.find(params[:id])
       teacher.department_id = department.id
       teacher.assign_attributes(teacher_params)
+
+      teacher_assists = []
+      params[:teacher_assist].each do |d|
+        teacher_assists << teacher.teacher_assign_follows.find_or_initialize_by(staff_id: d)
+      end
+      teacher.teacher_assign_follows = teacher_assists
+      
       if params[:user_id].present?
         user = User.find(params[:user_id])
         teacher.user_id = user.id
@@ -171,7 +206,10 @@ module EducodeSales
     end
 
     def edit
-      @teacher = Teacher.find(params[:id])
+      load_teacher
+      gon.teacher_assist = @teacher.teacher_assign_follows.map do |d|
+        {value: d.staff_id, name: d.staff.user.full_name}
+      end
       gon.department = { value: @teacher.department_id, name: "#{@teacher.department&.school&.name}-#{@teacher.department&.name}" }
       gon.value = @teacher.department_id
       render layout: false
@@ -256,17 +294,6 @@ module EducodeSales
       render layout: false
     end
 
-    # def create_follow_record
-    #
-    # end
-    #
-    # def update_follow_record
-    #
-    # end
-    # def delete_follow_record
-    #
-    # end
-
     def show_follow_record
       @follow_up = TeacherFollow.find(params[:id])
       render layout: false
@@ -294,7 +321,7 @@ module EducodeSales
 
     private
     def teacher_params
-      params.permit(:name, :professional_title, :job, :source_id)
+      params.permit(:name, :professional_title, :job, :source_id, :wechat)
     end
 
     def load_teacher

data/app/controllers/educode_sales/upload_files_controller.rb

@@ -20,7 +20,7 @@ module EducodeSales
     end
 
     def create
-      folder = File.join(Rails.root, "public", "images", 'educode_sales')
+      folder = File.join(Rails.root, "public", "files", 'educode_sales')
       upload_file = params["file"]
       raise "未上传文件" unless upload_file
       save_path = File.join(folder)
@@ -48,7 +48,7 @@ module EducodeSales
     end
 
     def destroy
-      folder = File.join(Rails.root, "public", "images", 'educode_sales')
+      folder = File.join(Rails.root, "public", "files", 'educode_sales')
       file = Attachment.find(params[:id])
       file.destroy
       File.delete(folder +  "/" +file.disk_filename) if FileTest::exist?(folder +  "/" +file.disk_filename)
@@ -56,7 +56,7 @@ module EducodeSales
     end
 
     def download
-      folder = File.join(Rails.root, "public", "images", 'educode_sales')
+      folder = File.join(Rails.root, "public", "files", 'educode_sales')
       file = Attachment.find_by_id(params[:id])
       raise "未找到文件" unless file
       send_file(folder +  "/" +file.disk_filename, filename: file.title, stream: true, type: file.content_type.presence || 'application/octet-stream')

data/app/models/educode_sales/teacher.rb

@@ -6,8 +6,9 @@ module EducodeSales
     has_many :operation_plans, dependent: :destroy
     has_many :course_subjects, dependent: :destroy
     has_many :key_person, dependent: :destroy
+    has_many :teacher_assign_follows
     belongs_to :department, optional: true
-    belongs_to :staff
+    belongs_to :staff, optional: true
     belongs_to :user, optional: true
     # belongs_to :follow_up, counter_cache: true, optional: true
     belongs_to :follow_up, class_name: 'TeacherFollow', optional: true

data/app/models/educode_sales/teacher_assign_follow.rb

@@ -0,0 +1,6 @@
+module EducodeSales
+  class TeacherAssignFollow < ApplicationRecord
+    belongs_to :staff
+    belongs_to :teacher
+  end
+end