educode_sales 0.9.71 → 0.9.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f06396ccf8dbcf15c84aecaa042d4c444335c9ef3a09c82d5ccced165beb429a
-  data.tar.gz: 1bbace4be30f8d50b507d9174b40cfec77073ff74e79188443359bdf1f146281
+  metadata.gz: bd2b28526eb6deff3149781638110e6f86c717287996bf7740437727adfd2ee3
+  data.tar.gz: cd3c64540eed97347f0f5b640136cc2fab13d74635246d54d5ca1e95dc1b4a43
 SHA512:
-  metadata.gz: 6034bfe4baf04919a142b18d57cdf9a8489fc9af2ec55597d36556a5ab69b6a9d1749d2c1271556a489f7d4907144e3c0b9db3769b7573cb967291fe3fb04b0b
-  data.tar.gz: 40edd2d1d9f49c081dad0251a573fadf67de0592755c54279d22518a80d2c3dea2777cb7d1daca05c7544f09a915078d79b3a63a9e94e4c2e025371f2a392e16
+  metadata.gz: f07f190aa90d48f53aa734204c86c77f7caa7fd3a374b71bd4b6a8080428542354d67b9eefd4037490da5b3784b3219fcc3286d1cba6dd1279489e6a3edabb3f
+  data.tar.gz: 27b899f64fe009157232ccaf573e83f4562a5496fbb69bdb5650105df89ca8599b26715c22e70af9aeff1bf355f75fcaab5ff8ef6768371ddf48ec35d85efab5

data/app/controllers/educode_sales/businesses_controller.rb

@@ -299,6 +299,22 @@ module EducodeSales
             @businesses = @businesses.joins("JOIN educode_sales_business_clazz_changes ON educode_sales_business_clazz_changes.business_id = educode_sales_businesses.id").where("educode_sales_business_clazz_changes.clazz_changed in (?)", clazz_changes)
           end
 
+         if params[:q].present? && params[:q][:property].present?
+            # 客户类型
+            @businesses = @businesses.joins(department: [school: :school_tags]).where("school_tags.id = ?", params[:q][:property])
+            # @businesses = @businesses.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id
+            #                                  JOIN schools ON departments.school_id = schools.id").where("schools.school_property_id = ?", params[:q][:property])
+          end 
+
+          if params[:q].present? && params[:q][:staff_manages].present?
+            # 销售经理
+            @businesses = @businesses.joins("LEFT JOIN educode_sales_follow_ups AS last_follow_up ON educode_sales_businesses.last_follow_up_id = last_follow_up.id AND last_follow_up.deleted_at IS NULL
+                                             LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = last_follow_up.id").
+                                      where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", params[:q][:staff_manages], params[:q][:staff_manages])
+              
+             
+          end
+
           if params[:sort].present? && params[:sort][:field]
             if params[:sort][:field] == "service_end_time"
               @businesses = @businesses.order("service_time_long #{params[:sort][:order]}")
@@ -1188,6 +1204,17 @@ module EducodeSales
       end
     end
 
+    def key_person
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+          @teachers = EducodeSales::KeyPerson.where(follow_up_id: params[:follow_up_id]).page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
     private
 
     def load_business

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -12,19 +12,34 @@ module EducodeSales
           if @current_admin.is_admin?
             @follow_ups = FollowUp.all
           else
+            permissions = @current_admin.permissions.pluck(:name)
+            area_business_ids = []
+            if permissions.include?("专项管理商机")
+              # 按客户类型查看商机下跟进记录
+              school_tag_ids  = EducodeSales::StaffSchoolTag.where(staff_id: 10009).pluck :school_tag_id
+              school_ids = SchoolTagMiddle.where(school_tag_id: school_tag_ids).pluck :school_id
+              area_business_ids = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?)", school_ids).pluck(:id)
+            end
+           
             level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
             case level
             when '自己'
+              if permissions.include?("区域管理商机")
+                # 按负责区域查看商机下跟进记录
+                school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+                area_business_ids += Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?)", school_ids).pluck(:id)
+              end
+              
               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)
+              @follow_ups = FollowUp.where(business_id: business_ids + area_business_ids)
             when '区域'
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_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)
+              @follow_ups = FollowUp.where(business_id: business_ids + area_business_ids)
             else
               @follow_ups = FollowUp.all
             end
@@ -110,7 +125,7 @@ module EducodeSales
           end
 
         end
-        @business.update(last_follow_up_id: follow_up.id, clazz_id: follow_up.clazz_id)
+        @business.update(last_follow_up_id: follow_up.id, clazz_id: follow_up.clazz_id, p_deploy_time: params[:deploy_time])
         # 增加o商机编号
         add_business_number
         update_department
@@ -154,7 +169,7 @@ module EducodeSales
       if follow_up.save
         # 增加o类商机
         @business = follow_up.business
-        @business.update(clazz_id: follow_up.clazz_id)
+        @business.update(clazz_id: follow_up.clazz_id, p_deploy_time: params[:deploy_time])
         add_business_number
         update_department
         render_success
@@ -284,7 +299,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :divide_rate, :budget_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :divide_rate, :budget_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment, :deploy_time, :rival)
     end
 
     # 更新部门和部门下老师用户的状态

data/app/controllers/educode_sales/project_charts_controller.rb

@@ -0,0 +1,145 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class ProjectChartsController < ApplicationController
+    # authorize_resource class: false
+
+    def trends
+    end
+    # 销售额分析
+    def sales_analysis
+      respond_to do |format|
+        format.html do
+        end
+        format.js do
+          x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+          count_type = params[:count_type] || "actual_amount"
+          stage_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
+          s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
+          @goal_count_range = params[:goal_count_range] || "month"
+
+          goal_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%m") }.uniq
+          sale_names = ['已中标', '已签单', '已回款']
+          @goal_count_data = month_sale_chart(goal_default_dates, sale_names, SaleTrend::COLORS, x, stage_ids, s_stage_ids, count_type, ["#{Time.now.year}-01", "#{Time.now.year}-#{Time.now.month}"])
+        end
+      end
+    end
+
+    private
+
+
+
+    def month_sale_chart(dates, names, colors, x, stage_ids, s_stage_ids, count_type, range)
+      begin_at = range[0]
+      end_at = range[1]
+
+      data_1 = EducodeSales::Business.joins(:last_follow_up).
+        where("educode_sales_follow_ups.clazz_id != ?", x).
+        where("educode_sales_follow_ups.stage_id IN (?)", stage_ids).
+        where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", begin_at, end_at).
+        select("SUM(#{count_type}) AS count_type, DATE_FORMAT(bidded_date, '%Y-%m') AS month").
+        group("DATE_FORMAT(bidded_date, '%Y-%m')").
+        order("DATE_FORMAT(bidded_date, '%Y-%m')")
+      data_1_hash = {}
+      data_1_total_hash = {}
+      data_1.each do |d|
+        data_1_hash[d.month] = d.count_type.round(2)
+      end
+
+      last_month = 0
+      last_sum = 0
+      dates.each do |month|
+        # 只累计当前年份
+        if last_month != month.split("-")[0]
+          last_sum = 0
+        end
+        data_1_total_hash[month] = ((data_1_hash[month] || 0) + last_sum).round(2)
+        last_sum += data_1_hash[month] || 0
+        last_month = month.split("-")[0]
+      end
+
+      data_2 = EducodeSales::Business.joins(:last_follow_up).
+        where("educode_sales_follow_ups.clazz_id != ?", x).
+        where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).
+        where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?", begin_at, end_at).
+        select("SUM(#{count_type}) AS count_type, DATE_FORMAT(signed_date, '%Y-%m') AS month").
+        group("DATE_FORMAT(signed_date, '%Y-%m')").
+        order("DATE_FORMAT(signed_date, '%Y-%m')")
+      data_2_hash = {}
+      data_2_total_hash = {}
+      data_2.each do |d|
+        data_2_hash[d.month] = d.count_type.round(2)
+      end
+
+      last_month = 0
+      last_sum = 0
+      dates.each do |month|
+        # 只累计当前年份
+        if last_month != month.split("-")[0]
+          last_sum = 0
+        end
+        data_2_total_hash[month] = ((data_2_hash[month] || 0) + last_sum).round(2)
+        last_sum += data_2_hash[month] || 0
+        last_month = month.split("-")[0]
+      end
+
+      data_3 = EducodeSales::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 <= ?", begin_at, end_at).
+        select("SUM(amount) AS count_type, DATE_FORMAT(date_at, '%Y-%m') AS month").
+        group("DATE_FORMAT(date_at, '%Y-%m')").
+        order("DATE_FORMAT(date_at, '%Y-%m')")
+      data_3_hash = {}
+      data_3.each do |d|
+        data_3_hash[d.month] = d.count_type.round(2)
+      end
+
+      data_3_total_hash = {}
+      last_month = 0
+      last_sum = 0
+      dates.each do |month|
+        # 只累计当前年份
+        if last_month != month.split("-")[0]
+          last_sum = 0
+        end
+        data_3_total_hash[month] = ((data_3_hash[month] || 0) + last_sum).round(2)
+        last_sum += data_3_hash[month] || 0
+        last_month = month.split("-")[0]
+      end
+
+      {
+        labels: dates,
+        datasets: names.map.with_index do |name, i|
+          {
+            label: name,
+            data: dates.map { |d|
+              case i
+              when 0
+                data_1_hash[d] || 0
+              when 1
+                data_2_hash[d] || 0
+              else
+                data_3_hash[d] || 0
+              end
+            },
+            data1: dates.map { |d|
+              case i
+              when 0
+                data_1_total_hash[d] || 0
+              when 1
+                data_2_total_hash[d] || 0
+              else
+                data_3_total_hash[d] || 0
+              end
+            },
+            backgroundColor: colors[i],
+            borderColor: colors[i],
+            borderWidth: 1
+          }
+        end
+      }
+    end
+
+  end
+end

data/app/controllers/educode_sales/staffs_controller.rb

@@ -137,5 +137,40 @@ module EducodeSales
       @schools = (EducodeSales::Business.joins(:follow_ups, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.id}").select("departments.id, departments.name, schools.name AS school, educode_sales_follow_ups.updated_at") + EducodeSales::Teacher.joins(:follow_up, [department: :school]).where("educode_sales_teacher_follows.staff_id = #{staff.id}").select("departments.id, departments.name, schools.name AS school, educode_sales_teacher_follows.updated_at")).uniq { |s| s.id }
     end
 
+    def list
+      @staffs = EducodeSales::Staff.where.not(id: params[:id]).map { |d| [d.user.real_name, d.id ]}
+      gon.trans_staffs = @staffs.to_h.invert
+      render layout: false
+    end
+
+    def transfer
+      if @current_admin.is_admin?
+        staff = Staff.find(params[:id])
+        to = Staff.find(params[:to_id])
+        staff.businesses.update_all(staff_id: to.id)
+        # 商机
+        staff.follow_ups.update_all(staff_id: to.id)
+        # 销售动态
+        staff.sale_plans.update_all(staff_id: to.id)
+        # 销售计划
+        staff.places.update_all(staff_id: to.id)
+        # 渠道
+        staff.activities.update_all(staff_id: to.id)
+        # 活动
+        staff.teachers.update_all(staff_id: to.id)
+        # 教师
+        staff.teacher_follows.update_all(staff_id: to.id)
+        # 教师动态
+        staff.operation_plans.update_all(staff_id: to.id)
+        # 活动计划
+
+        EducodeSales::Activity.where(sales_id: staff.id).update_all(sales_id: to.id)
+        CustomerExtension.where(staff_id: staff.id).update_all(staff_id: to.id)
+        # 回款计划
+        MoneyPlan.where(staff_id: staff.id).update_all(staff_id: to.id)
+        # 客户
+      end
+      render_success
+    end
   end
 end

data/app/helpers/educode_sales/application_helper.rb

@@ -103,15 +103,162 @@ module EducodeSales
 
       ids_a_b = Common.where(extras: %w[a_class b_class ]).pluck(:id)
       ids_c_d = Common.where(extras: %w[c_class d_class]).pluck(:id)
-      @businesses_a_b_count = @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.clazz_id in (?)",ids_a_b)
-                                   .where("educode_sales_businesses.staff_id = ?",staff_id)
-                                   .where("educode_sales_businesses.created_at >= ? and educode_sales_businesses.created_at <= ?", "#{@assessment_year}-#{start_time} 00:00:00".to_date,
+      @businesses_a_b_count = @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.clazz_id in (?)", ids_a_b)
+                                         .where("educode_sales_businesses.staff_id = ?", staff_id)
+                                         .where("educode_sales_businesses.created_at >= ? and educode_sales_businesses.created_at <= ?", "#{@assessment_year}-#{start_time} 00:00:00".to_date,
                                                 "#{@assessment_year}-#{end_time} 23:59:00".to_date)
-      @businesses_c_d_count = @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.clazz_id in (?)",ids_c_d)
-                                         .where("educode_sales_businesses.staff_id = ?",staff_id)
+      @businesses_c_d_count = @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.clazz_id in (?)", ids_c_d)
+                                         .where("educode_sales_businesses.staff_id = ?", staff_id)
                                          .where("educode_sales_businesses.created_at >= ? and educode_sales_businesses.created_at <= ?", "#{@assessment_year}-#{start_time} 00:00:00".to_date,
                                                 "#{@assessment_year}-#{end_time} 23:59:00".to_date)
-      @businesses_a_b_count.count.to_i*10  + @businesses_c_d_count.count.to_i*5
+      @businesses_a_b_count.count.to_i * 10 + @businesses_c_d_count.count.to_i * 5
+    end
+
+    def get_businesses_chart(year, month)
+      contract_ids = EducodeSales::Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
+      @businesses = EducodeSales::Business.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id in (?)", contract_ids)
+
+      # 逾期id
+      late_ids = EducodeSales::Business.joins("JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id JOIN educode_sales_commons on educode_sales_commons.id = educode_sales_follow_ups.stage_id")
+                                       .where("educode_sales_follow_ups.bidded_date is not null")
+                                       .where("NOW() > DATE_ADD(educode_sales_follow_ups.bidded_date, INTERVAL 1 MONTH)")
+                                       .where("educode_sales_businesses.p_stage is null")
+                                       .where("educode_sales_commons.name = '已中标'")
+                                       .or(EducodeSales::Business.joins("JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id JOIN educode_sales_commons on educode_sales_commons.id = educode_sales_follow_ups.stage_id")
+                                                                 .where("NOW() > educode_sales_businesses.p_pre_money_time")
+                                                                 .where("educode_sales_businesses.p_pre_money_time is not null")
+                                                                 .where("educode_sales_businesses.p_actual_money_time is null")
+                                       ).or(EducodeSales::Business.joins("JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id JOIN educode_sales_commons on educode_sales_commons.id = educode_sales_follow_ups.stage_id")
+                                                                  .where("NOW() > educode_sales_businesses.p_pre_accept_time")
+                                                                  .where("educode_sales_businesses.p_pre_accept_time is not null")
+                                                                  .where("educode_sales_businesses.p_accept_time is null")).ids
+
+      # 待交付项目
+      data_4 = @businesses.where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-" + month + "-01", year + "-" + month + "-31")
+                          .count("distinct educode_sales_businesses.id")
+      # 实际交付
+      data_5 = @businesses.where("educode_sales_businesses.p_deploy_time > ? AND educode_sales_businesses.p_deploy_time < ?", year + "-" + month + "-01", year + "-" + month + "-31")
+                          .count("distinct educode_sales_businesses.id")
+      # 待准备项目
+      data_6 = @businesses.where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-" + month + "-01", year + "-" + month + "-31")
+                          .count("distinct educode_sales_businesses.id")
+      # 完成准备
+      data_7 = @businesses.where("educode_sales_businesses.p_status = 1")
+                          .where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-" + month + "-01", year + "-" + month + "-31")
+                          .count("distinct educode_sales_businesses.id")
+      # 待验收平台包
+      data_8 = @businesses.where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-" + month + "-01", year + "-" + month + "-31")
+                          .count("distinct educode_sales_businesses.id")
+      # 实际验收平台包
+      data_9 = @businesses.where("educode_sales_businesses.p_platform_time is not null")
+                          .where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-" + month + "-01", year + "-" + month + "-31")
+                          .count("distinct educode_sales_businesses.id")
+      # 待验收课程包
+      data_10 = @businesses.where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-" + month + "-01", year + "-" + month + "-31")
+                           .count("distinct educode_sales_businesses.id")
+      # 实际验收课程包
+      data_11 = @businesses.where("educode_sales_businesses.p_course_time is not null")
+                           .where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-" + month + "-01", year + "-" + month + "-31")
+                           .count("distinct educode_sales_businesses.id")
+      data_2 = data_4 + data_6 + data_8 + data_10 # 本月总任务
+      data_3 = data_5 + data_7 + data_9 + data_11 # 本月完成任务
+      # 本月任务完成度
+      data_1 = data_2.zero? ? 0 : (data_3.to_f / data_2.to_f).round(2) * 100
+
+      # 历史遗漏项目
+      data_12 = @businesses.where("educode_sales_follow_ups.reception_at < ?", year + "-01-01")
+                           .where("educode_sales_businesses.p_course_time IS NULL
+                       OR educode_sales_businesses.p_platform_time IS NULL
+                       OR educode_sales_businesses.p_deploy_time IS NULL
+                       OR educode_sales_businesses.p_actual_money_time IS NULL
+                       OR educode_sales_businesses.p_accept_time IS NULL
+").count("distinct educode_sales_businesses.id")
+      # 年度待交付项目
+      data_13 = @businesses.where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-01-01", year + "-12-31")
+                           .count("distinct educode_sales_businesses.id")
+      # 年度已交付项目
+      data_14 = @businesses.where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-01-01", year + "-12-31")
+                           .where("educode_sales_businesses.p_course_time IS NOT NULL
+                       AND educode_sales_businesses.p_platform_time IS NOT NULL
+                       AND educode_sales_businesses.p_deploy_time IS NOT NULL
+                       AND educode_sales_businesses.p_actual_money_time IS NOT NULL
+                       AND educode_sales_businesses.p_accept_time IS NOT NULL
+").count("distinct educode_sales_businesses.id")
+      # 年度延期项目
+      data_15 = @businesses.where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-01-01", year + "-12-31")
+                           .where(id: late_ids)
+                           .count("distinct educode_sales_businesses.id")
+
+      year_data_all_1 = @businesses.where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-01-01", year + "-12-31")
+                                   .group(:p_staff_id).sum("case when educode_sales_businesses.p_course_time is not null then 1 else 0 end + case when educode_sales_businesses.p_platform_time is not null then 1 else 0 end + case when educode_sales_businesses.p_deploy_time is not null then 1 else 0 end + case when educode_sales_businesses.p_actual_money_time is not null then 1 else 0 end + case when educode_sales_businesses.p_accept_time is not null then 1 else 0 end")
+      year_data_all_2 = @businesses.where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-01-01", year + "-12-31")
+                                   .group(:p_sale_staff_id).sum("case when educode_sales_businesses.p_course_time is not null then 1 else 0 end + case when educode_sales_businesses.p_platform_time is not null then 1 else 0 end + case when educode_sales_businesses.p_deploy_time is not null then 1 else 0 end + case when educode_sales_businesses.p_actual_money_time is not null then 1 else 0 end + case when educode_sales_businesses.p_accept_time is not null then 1 else 0 end")
+      month_data_all_1 = @businesses.where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-" + month + "-01", year + "-" + month + "-31")
+                                    .group(:p_staff_id).sum("case when educode_sales_businesses.p_course_time is not null then 1 else 0 end + case when educode_sales_businesses.p_platform_time is not null then 1 else 0 end + case when educode_sales_businesses.p_deploy_time is not null then 1 else 0 end + case when educode_sales_businesses.p_actual_money_time is not null then 1 else 0 end + case when educode_sales_businesses.p_accept_time is not null then 1 else 0 end")
+      month_data_all_2 = @businesses.where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-" + month + "-01", year + "-" + month + "-31")
+                                    .group(:p_sale_staff_id).sum("case when educode_sales_businesses.p_course_time is not null then 1 else 0 end + case when educode_sales_businesses.p_platform_time is not null then 1 else 0 end + case when educode_sales_businesses.p_deploy_time is not null then 1 else 0 end + case when educode_sales_businesses.p_actual_money_time is not null then 1 else 0 end + case when educode_sales_businesses.p_accept_time is not null then 1 else 0 end")
+
+      year_merged_hash = month_data_all_1.merge(month_data_all_2) { |key, v1, v2| v1 + v2 }.sort_by { |k, v| v }.reverse.to_h
+      month_merged_hash = year_data_all_1.merge(year_data_all_2) { |key, v1, v2| v1 + v2 }.sort_by { |k, v| v }.reverse.to_h
+
+      not_finish_year_data_all_1 = @businesses.where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-01-01", year + "-12-31")
+                                              .group(:p_staff_id).sum("case when educode_sales_businesses.p_course_time is null then 1 else 0 end + case when educode_sales_businesses.p_platform_time is null then 1 else 0 end + case when educode_sales_businesses.p_deploy_time is null then 1 else 0 end + case when educode_sales_businesses.p_actual_money_time is null then 1 else 0 end + case when educode_sales_businesses.p_accept_time is null then 1 else 0 end")
+      not_finish_year_data_all_2 = @businesses.where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-01-01", year + "-12-31")
+                                              .group(:p_sale_staff_id).sum("case when educode_sales_businesses.p_course_time is null then 1 else 0 end + case when educode_sales_businesses.p_platform_time is null then 1 else 0 end + case when educode_sales_businesses.p_deploy_time is null then 1 else 0 end + case when educode_sales_businesses.p_actual_money_time is null then 1 else 0 end + case when educode_sales_businesses.p_accept_time is null then 1 else 0 end")
+      not_finish_month_data_all_1 = @businesses.where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-" + month + "-01", year + "-" + month + "-31")
+                                               .group(:p_staff_id).sum("case when educode_sales_businesses.p_course_time is null then 1 else 0 end + case when educode_sales_businesses.p_platform_time is null then 1 else 0 end + case when educode_sales_businesses.p_deploy_time is null then 1 else 0 end + case when educode_sales_businesses.p_actual_money_time is null then 1 else 0 end + case when educode_sales_businesses.p_accept_time is null then 1 else 0 end")
+      not_finish_month_data_all_2 = @businesses.where("educode_sales_follow_ups.reception_at > ? AND educode_sales_follow_ups.reception_at < ?", year + "-" + month + "-01", year + "-" + month + "-31")
+                                               .group(:p_sale_staff_id).sum("case when educode_sales_businesses.p_course_time is null then 1 else 0 end + case when educode_sales_businesses.p_platform_time is null then 1 else 0 end + case when educode_sales_businesses.p_deploy_time is null then 1 else 0 end + case when educode_sales_businesses.p_actual_money_time is null then 1 else 0 end + case when educode_sales_businesses.p_accept_time is null then 1 else 0 end")
+      not_finish_year_merged_hash = not_finish_year_data_all_1.merge(not_finish_year_data_all_2) { |key, v1, v2| v1 + v2 }.sort_by { |k, v| v }.reverse.to_h
+      not_finish_month_merged_hash = not_finish_month_data_all_1.merge(not_finish_month_data_all_2) { |key, v1, v2| v1 + v2 }.sort_by { |k, v| v }.reverse.to_h
+
+      all_year_merged_hash = year_merged_hash.merge(not_finish_year_merged_hash) { |key, v1, v2| v1 + v2 }.sort_by { |k, v| v }.reverse.to_h
+      all_month_merged_hash = month_merged_hash.merge(not_finish_month_merged_hash) { |key, v1, v2| v1 + v2 }.sort_by { |k, v| v }.reverse.to_h
+      staffs = EducodeSales::Staff.all.includes(:user)
+      colors = SaleTrend::COLORS
+      chart1 = {
+        labels: staffs.map { |d| d.user.real_name },
+        datasets: %w[已完成 未完成].map.with_index do |d, i|
+          {
+            label: d,
+            data: staffs.map { |s|
+              case d
+              when "已完成"
+                month_merged_hash[s.id].to_i
+              when "未完成"
+                not_finish_month_merged_hash[s.id].to_i
+              end
+            },
+            backgroundColor: colors[i],
+            borderColor: colors[i],
+            borderWidth: 1
+          }
+        end
+      }
+      chart2 = {
+        labels: staffs.map { |d| d.user.real_name },
+        datasets: %w[已完成 未完成].map.with_index do |d, i|
+          {
+            label: d,
+            data: staffs.map { |s|
+              case d
+              when "已完成"
+                year_merged_hash[s.id].to_i
+              when "未完成"
+                not_finish_year_merged_hash[s.id].to_i
+              end
+            },
+            backgroundColor: colors[i],
+            borderColor: colors[i],
+            borderWidth: 1
+          }
+        end
+      }
+      staff_data = EducodeSales::Staff.where(id: year_merged_hash.keys).limit(3).map { |d| [d.user.real_name, all_year_merged_hash[d.id], year_merged_hash[d.id]] }
+
+      [data_1, data_2, data_3, data_4, data_5, data_6, data_7, data_8, data_9, data_10, data_11, data_12, data_13, data_14, data_15, staff_data, chart1, chart2]
     end
 
   end

data/app/views/educode_sales/businesses/_follows.html.erb

@@ -141,10 +141,20 @@
                     },
                     {
                         field: 'key_people',
-                        width: 90,
+                        width: 100,
                         title: '关键人',
                         templet:'<div><span title="{{d.key_people}}">{{d.key_people}}</span></div>'
                     },
+                    {
+                      field: 'rival',
+                      width: 100,
+                      title: '竞争对手',
+                    },    
+                    {
+                        field: 'staff_manages',
+                        width: 120,
+                        title: '销售经理',
+                    },
                     {
                         field: 'tel',
                         width: 90,

data/app/views/educode_sales/businesses/edit_follow_record.html.erb

@@ -63,6 +63,14 @@
                id="reception_at_edit" placeholder="请选择日期">
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">部署时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" value="<%= @follow_up.business.p_deploy_time %>" name="deploy_time"
+               id="p_deploy_time" placeholder="请选择日期">
+      </div>
+    </div>
+    
     <br>
     <div class="layui-inline service_show layui-hide">
       <label class="layui-form-label required">服务期</label>
@@ -133,6 +141,14 @@
         </div>
       </div>
     </div>
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">竞争对手</label>
+        <div class="layui-input-inline">
+          <input type="text" class="layui-input" name="rival" autocomplete="off"  value="<%= @follow_up&.rival%>">
+        </div>
+      </div>
+    </div>
     <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
       <div class="layui-input-inline" style="">
@@ -209,6 +225,9 @@
         laydate.render({
             elem: '#invitation_at_edit'
         })
+        laydate.render({
+            elem: '#p_deploy_time'
+        })
         laydate.render({
             elem: '#service_time',
             range: true