educode_sales 0.5.3 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87e480da43efa545f556407cb3aced122684a09ebba821cc1d5ba1b33013758c
-  data.tar.gz: f8a1d0d849c2f45fac61856394ebd61fa19c6993349393cf30c73061071e200b
+  metadata.gz: ef5373cd46335d53f4f5062b2ac750c01fa8797ddf1626c4373c6997e5e1fa9f
+  data.tar.gz: f27164e66b64b22b5b0c889ffb3c5c2c6567559f490a00e4af8a32f4298841dd
 SHA512:
-  metadata.gz: 2b9b85218c9ab2ba92752aaac23ed8329bd130c48f27c00488d4e8a484cdb8791b29b9be8bb9ccafa6828ba9bc4500c4365718d5c080cfd789960c5125c2da33
-  data.tar.gz: 8ae91d1a4d9337886c87067b69728cd93831e8d7a85bf524c6acef57915561726a574d6a3c5a1c2eb4cead28ea6aea1450dd94949920d0113856b7390f418445
+  metadata.gz: a9d42047fdaeba4c49096c40dd92b9d33ed77f84ef7a65410f34bab1a0408be55c7db38caa5e30aab0456d1b93af4db2a0c79c953dfdfd9f39579f26e5a1cef2
+  data.tar.gz: 2850fa03b263d9a06f0d2af5c9649b9ccd30719a58e5a0f0dac41bb2b495c2745e2ed1b8711ecabdac249166c75dadec3d26b7219800398ee7ff219c6fa167c7

data/app/controllers/educode_sales/businesses_controller.rb

@@ -176,6 +176,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])
@@ -269,6 +270,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 = [{ value: @last_follow_up.place&.id, name: @last_follow_up.place&.name }]
       end
       render layout: false
     end
@@ -302,6 +304,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 = [{ value: @follow_up.place&.id, name: @follow_up.place&.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][:follows_business].present?
+            @follow_ups = @follow_ups.joins(:business).where("educode_sales_businesses.name LIKE ?", "%#{params[:q][:follows_business]}%")
+          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][:follows_staff_id].present?
+            @follow_ups = @follow_ups.where(staff_id: params[:q][:follows_staff_id])
+          end
+          if params[:q].present? && params[:q][:follows_department].present?
+            departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:q][:follows_department]}%").pluck(:id)
+            @follow_ups = @follow_ups.joins(business: :department).where("departments.id in (?)", departments_ids)
+          end
+          if params[:q].present? && params[:q][:follows_area].present?
+            p = EducodeSales::Common.find(params[:q][:follows_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)

data/app/controllers/educode_sales/home_controller.rb

@@ -43,6 +43,9 @@ module EducodeSales
 
     def sales_staff
       common = Common.find_by(clazz: 'staff_type', name: '销售')
+      if params[:teacher_assist].present?
+        common = Common.find_by(clazz: 'staff_type', name: '运营')
+      end
       @staffs = Staff
       if params[:q].present?
         @staffs = @staffs.joins(user: :user_extension).where("concat(lastname, firstname) like :q", q: "%#{params[:q]}%")
@@ -50,5 +53,13 @@ module EducodeSales
       @staffs = @staffs.where(is_admin: false).where.not(id: @current_admin.id).where(job_type: common.id).page(params[:page]).per(10)
     end
 
+    def sales_place
+      @places = EducodeSales::Place
+      if params[:q].present?
+        @places = @places.where("name like :q", q: "%#{params[:q]}%")
+      end
+      @places = @places.page(params[:page]).per(10)
+    end
+
   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,42 @@ 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: "#fff",
-            borderColor: colors[names.index(name)%15],
-            pointBackgroundColor: colors[names.index(name)%15],
-            borderWidth: 1
+            pointBorderColor: colors[i%15+1],
+            borderColor: colors[i%15+1],
+            pointBackgroundColor: colors[i%15+1],
+            borderWidth: 2
+          }
+        end
+      }
+    end
+    def week_follow_count_chart(dates,names,x_business_ids,colors)
+      {
+        labels: dates,
+        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 = 0
+               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
+               },
+            backgroundColor: "#fff",
+            pointBorderColor: colors[i%15+1],
+            borderColor: colors[i%15+1],
+            pointBackgroundColor: colors[i%15+1],
+            borderWidth: 2
           }
         end
       }
@@ -182,16 +161,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: "#fff",
-            borderColor: colors[names.index(name)%15],
-            pointBackgroundColor: colors[names.index(name)%15],
-            borderWidth: 1
+            pointBorderColor: colors[i%15+1],
+            borderColor: colors[i%15+1],
+            pointBackgroundColor: colors[i%15+1],
+            borderWidth: 2,
           }
         end
       }
@@ -199,21 +178,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: "#fff",
-            borderColor: colors[names.index(name)%15],
-            pointBackgroundColor: colors[names.index(name)%15],
-            borderWidth: 1
+            pointBorderColor: colors[i%15+1],
+            borderColor: colors[i%15+1],
+            pointBackgroundColor: colors[i%15+1],
+            borderWidth: 2
           }
         end
       }
     end
 
+    def month_sale_chart(dates,names,colors,x,stage_ids,s_stage_ids,count_type)
+      {
+        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/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,25 @@ 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 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 +73,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 +125,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 +170,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 +201,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 +289,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 +316,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

data/app/views/educode_sales/activities/index.html.erb

@@ -52,24 +52,23 @@
                 {
                   field: 'name',
                   title: '活动名称',
-                  width: 400,
                   templet: '#teachers'
                 },
                 {
                   field: 'start_at',
-                  width: 120,
+                  width: 200,
                   title: '时间',
                   sort: true,
                 },
                 {
                   field: 'days',
                   title: '天数',
-                  width: 100
+                  width: 200
                 },
                 {
                   field: 'teachers_count',
                   title: '教师数',
-                  width: 100,
+                  width: 200,
                     totalRow:true,
                   templet: '#teachers_count'
                 },
@@ -77,7 +76,7 @@
                   field: 'students_count',
                   title: '学生数',
                     totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
-                  width: 100
+                  width: 200
                 },
                 {
                   title: '操作',

data/app/views/educode_sales/activities/show_teachers.html.erb

@@ -2,7 +2,7 @@
 <script type="text/html" id="teacher_toolbar">
   <div class="layui-btn-container">
     <span class="table-label">教师列表</span>
-    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="search_new"> 添加
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="search_new"> 添加教师
     </button>
   </div>
 </script>