educode_sales 0.9.72 → 0.9.74

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/roles_controller.rb

@@ -16,7 +16,7 @@ module EducodeSales
 
     def create
       role = Role.new(name: params[:name])
-      role.role_areas.build([{ clazz: 'Business' }, { clazz: 'SalePlan' }, { clazz: 'Teacher' }, { clazz: 'Operation' }, { clazz: 'Customer' }, { clazz: 'MoneyPlan' }, { clazz: 'AssessmentsSetting' }, { clazz: 'Idea' }, { clazz: 'Project' }])
+      role.role_areas.build([{ clazz: 'Business' }, { clazz: 'Contract' }, { clazz: 'SalePlan' }, { clazz: 'Teacher' }, { clazz: 'Operation' }, { clazz: 'Customer' }, { clazz: 'MoneyPlan' }, { clazz: 'AssessmentsSetting' }, { clazz: 'Idea' }, { clazz: 'Project' }])
       if role.save
         render_success
       else
@@ -75,6 +75,7 @@ module EducodeSales
     def view
       role = Role.find(params[:id])
       role.role_areas.find_by(clazz: 'Business').update(level: params[:business])
+      role.role_areas.find_by(clazz: 'Contract').update(level: params[:contract])
       role.role_areas.find_by(clazz: 'Operation').update(level: params[:operation])
       role.role_areas.find_by(clazz: 'SalePlan').update(level: params[:sale_plan])
       role.role_areas.find_by(clazz: 'Teacher').update(level: params[:teacher])

data/app/controllers/educode_sales/upload_files_controller.rb

@@ -36,6 +36,9 @@ module EducodeSales
         if params[:activity_id].present?
           @attachment.container_id = params[:activity_id]
           @attachment.container_type = 'EducodeSales::Activity'
+        elsif params[:idea_id].present?
+          @attachment.container_id = params[:idea_id]
+          @attachment.container_type = 'EducodeSales::Idea'
         else
           @attachment.description = "business"
           @attachment.container_id = params[:business_id]

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/models/educode_sales/assign_staff.rb

@@ -0,0 +1,6 @@
+module EducodeSales
+  class AssignStaff < ApplicationRecord
+    belongs_to :staff
+    belongs_to :sourcable, :polymorphic => true
+  end
+end

data/app/models/educode_sales/contract_date_list.rb

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

data/app/models/educode_sales/follow_up.rb

@@ -8,6 +8,10 @@ module EducodeSales
       ["混合云", 3]
     ]
 
+    InfoClazz = ['跟进信息', '建议信息', '评论信息', '审核信息']
+
+    enum funding_source: ['贷款资金', '财政资金', '自由资金']
+
     include ::Deletable
     belongs_to :business, counter_cache: true # counter_cache(自动计算 business对应follow_up表中对应的个数)
     belongs_to :place, optional: true
@@ -19,6 +23,8 @@ module EducodeSales
     belongs_to :stage, class_name: 'Common'
     belongs_to :clazz, class_name: 'Common'
 
+    has_many :assign_staffs, as: :sourcable # 售后人员
+
 
     default_scope  -> {where(deleted_at: nil)}
 

data/app/models/educode_sales/idea.rb

@@ -1,6 +1,7 @@
 module EducodeSales
   class Idea < ApplicationRecord
     belongs_to :department, optional: true
+    belongs_to :business, optional: true
     belongs_to :staff, optional: true
     belongs_to :school, optional: true
     belongs_to :attachment, optional: true
@@ -8,19 +9,25 @@ module EducodeSales
     belongs_to :deleter, class_name: 'Staff', optional: true
     belongs_to :sale_staff, class_name: 'Staff', optional: true
     belongs_to :idea_staff, class_name: 'Staff', optional: true
+    has_many :idea_follows, dependent: :destroy
+    has_one :last_idea_follow, class_name: 'IdeaFollow'
 
     has_many :idea_histories, dependent: :destroy
 
+    has_many :files, class_name: 'Attachment', as: :container, dependent: :destroy
+
     scope :deleted, -> { where(is_deleted: true) }
     scope :not_deleted, -> { where(is_deleted: false) }
 
     enum level: %w[高 中 低]
     enum status: %w[未完成 已完成]
-    enum types: %w[定制 非定制]
+    enum types: %w[低定制 非定制 高定制 全定制]
     enum model: %w[本地版 线上版 混合版]
+    enum idea_type: %w[售前 售后]
 
     serialize :assist_staff_ids,Array
     serialize :attachment_ids, Array
+    serialize :other_staff_ids, Array
 
     # before_save :check_changes
 
@@ -32,6 +39,10 @@ module EducodeSales
       Staff.where(id: self.assist_staff_ids)
     end
 
+    def other_staffs
+      Staff.where(id: self.other_staff_ids)
+    end
+
     def attachments
       Attachment.where(id: self.attachment_ids)
     end
@@ -68,7 +79,7 @@ module EducodeSales
       when "staff_id"
         old_value = Staff.find_by(id: old_value)&.user&.real_name
         new_value = Staff.find_by(id: new_value)&.user&.real_name
-        "方案指派人由“#{old_value}”变更为“#{new_value}”"
+        "方案经理由“#{old_value}”变更为“#{new_value}”"
       when "status"
         "状态由“#{old_value}”变更为“#{new_value}”"
       when "types"
@@ -84,13 +95,13 @@ module EducodeSales
       when "end_time"
         "截止时间由“#{old_value}”变更为“#{new_value}”"
       when "content"
-        "反馈情况由“#{old_value}”变更为“#{new_value}”"
+        "需求说明由“#{old_value}”变更为“#{new_value}”"
       when "department_id"
         old_value = Department.find_by(id: old_value)&.name
         new_value = Department.find_by(id: new_value)&.name
-        "院系/部门由“#{old_value}”变更为“#{new_value}”"
+        "部门由“#{old_value}”变更为“#{new_value}”"
       when "manager_name"
-        "学校负责人由“#{old_value}”变更为“#{new_value}”"
+        "单位联系人由“#{old_value}”变更为“#{new_value}”"
       when "manager_phone"
         "负责人电话由“#{old_value}”变更为“#{new_value}”"
       else

data/app/models/educode_sales/idea_follow.rb

@@ -0,0 +1,11 @@
+module EducodeSales
+  class IdeaFollow < ApplicationRecord
+    belongs_to :idea, optional: true, counter_cache: true
+    belongs_to :staff, optional: true
+    belongs_to :sale_staff, class_name: "Staff", foreign_key: "sale_staff_id", optional: true
+    belongs_to :idea_staff, class_name: "Staff", foreign_key: "idea_staff_id", optional: true
+    belongs_to :school, optional: true
+
+    enum status: %w[未完成 已完成]
+  end
+end

data/app/models/educode_sales/permission.rb

@@ -15,7 +15,8 @@ module EducodeSales
       '回款管理': 'money_plan',
       '绩效考核': 'assessments_setting',
       '方案管理': 'idea',
-      '项目管理': 'project'
+      '项目管理': 'project',
+      '合同管理': 'contract'
     }
   end
 end

data/app/models/educode_sales/role_area.rb

@@ -12,7 +12,8 @@ module EducodeSales
       '回款管理': 'MoneyPlan',
       '绩效考核': 'AssessmentsSetting',
       '方案管理': 'Idea',
-      '项目管理': 'Project'
+      '项目管理': 'Project',
+      '合同管理': 'Contract'
     }
   end
 end