educode_sales 0.9.73 → 0.9.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd2b28526eb6deff3149781638110e6f86c717287996bf7740437727adfd2ee3
-  data.tar.gz: cd3c64540eed97347f0f5b640136cc2fab13d74635246d54d5ca1e95dc1b4a43
+  metadata.gz: 49bce310f13d0fc4f79490b47fb3dd691cb80447e2095e8a120746f012dc5f7a
+  data.tar.gz: eb98ae1ee690e78c4cc71f7b61256d8b82de70137aeca24ee267f44863d8854a
 SHA512:
-  metadata.gz: f07f190aa90d48f53aa734204c86c77f7caa7fd3a374b71bd4b6a8080428542354d67b9eefd4037490da5b3784b3219fcc3286d1cba6dd1279489e6a3edabb3f
-  data.tar.gz: 27b899f64fe009157232ccaf573e83f4562a5496fbb69bdb5650105df89ca8599b26715c22e70af9aeff1bf355f75fcaab5ff8ef6768371ddf48ec35d85efab5
+  metadata.gz: 236e971030f94a6b56eb815808bcdbc2095e2ac098c4058f201fe5460c0489017a93d76e414de6516648e8d4e20916f7fc72c97911ef43b8393950b4e7cd8041
+  data.tar.gz: ad2389705947bba8ed007bf0a077bfd445f88d19bece5f09b94fa8662eb354b4989fb91137735c4d76a1640f4094cb369b1eff5e99df5b652eea06931a594c3e

data/app/controllers/educode_sales/contracts_controller.rb

@@ -0,0 +1,309 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class ContractsController < ApplicationController
+    def index
+      authorize! :read_contract, Business
+      respond_to do |format|
+        format.html do
+          common = Common.find_by(clazz: 'staff_type', name: '销售')
+          staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11)
+          @staffs = staffs.map { |d| [d.user.real_name, d.id]}
+          gon.staffs = staffs.map { |d| {name: d.user.real_name, value: d.id } }
+          gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
+          gon.staffs = staffs.map { |d| {name: d.user.real_name, value: d.id } }
+
+          bussiness_type = []
+          if params[:type]
+            # 项目类型
+            bussiness_type = EducodeSales::Business.include_types(params[:type]) || []
+          end
+    
+          business_step = []
+          if params[:step]
+            # 项目阶段
+            business_step = EducodeSales::Business.include_steps(params[:step]) || []
+          end
+    
+    
+          gon.business_type = Common.where(clazz: 'business_type').map do |d|
+            {value: d.id, name: d.name, selected: bussiness_type.include?(d.extras)}
+          end
+    
+          gon.business_step = Common.where(clazz: 'business_step', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).order("position").map do |d|
+            {value: d.id, name: d.name, selected: business_step.include?(d.name)}
+          end
+        end
+        format.json do
+          @businesses = Business
+          contract_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
+          @businesses = @businesses.joins("
+            JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+          ").where("educode_sales_follow_ups.stage_id in (?)", contract_ids)
+
+          if @current_admin.is_admin?
+            @businesses = @businesses
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '合同管理').level
+            case level
+            when '自己'
+              @businesses = @businesses.where("educode_sales_businesses.staff_id = ?", @current_admin.id)
+            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)
+              @businesses = @businesses.where(business_id: business_ids)
+            end
+          end
+
+
+          if params[:q] && params[:q][:signed_date].present?
+            date = params[:q][:signed_date].split(" - ")
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?", date[0], date[1])
+          end
+
+          if params[:q]&& params[:q][:date_at].present?
+            date = params[:q][:date_at].split(" - ")
+            x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+            @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= 1").where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", date[0] + " 00:00:00", date[1] + " 23:59:59").distinct
+          end
+
+          if params[:q] && params[:q][:bidded_date].present?
+            date = params[:q][:bidded_date].split(" - ")
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", date[0], date[1])
+          end
+
+
+          if params[:q].present? && params[:q][:name].present?
+            @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
+          end
+          if params[:q].present? && params[:q][:department].present?
+            departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:q][:department]}%").pluck(:id)
+            @businesses = @businesses.joins(:department).where("departments.id in (?)", departments_ids)
+          end
+          if params[:q].present? && params[:q][:staff_id].present?
+            part_a_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is null AND educode_sales_businesses.staff_id = ?",params[:q][:staff_id]).ids
+            part_b_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is not null").joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.staff_id = ?", params[:q][:staff_id]).ids
+            business_ids = part_a_ids + part_b_ids
+            @businesses = EducodeSales::Business.where(id:business_ids)
+          end
+          if params[:q].present? && params[:q][:business_type].present?
+            @businesses = @businesses.where("educode_sales_businesses.clazz_id in (?)", params[:q][:business_type].split(",").map(&:to_i))
+          end
+       
+          if params[:q].present? && params[:q][:business_step].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id in (?)", params[:q][:business_step].split(",").map(&:to_i))
+          end
+          if params[:q].present? && params[:q][:place_id].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.place_id = ?", params[:q][:place_id])
+          end
+          if params[:q].present? && params[:q][:business_year].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.year = ?", params[:q][:business_year])
+          end
+
+          if params[:q].present? && params[:q][:year].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.year <= ?", params[:q][:year])
+          end
+
+          if params[:q].present? && params[:q][:o_business_deployment].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.o_business_deployment = ?", params[:q][:o_business_deployment])
+          end
+
+          if params[:q].present? && params[:q][:area].present?
+            area = EducodeSales::Common.find(params[:q][:area]).name
+            if @current_admin.is_admin?
+              @businesses = @businesses.joins("
+                JOIN departments ON educode_sales_businesses.department_id = departments.id
+                JOIN schools ON departments.school_id = schools.id
+              ").where("province = ?", area)
+            else
+              level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
+              if level == "区域"
+                  @businesses = @businesses.joins("
+                    JOIN schools ON departments.school_id = schools.id
+                  ").where("province = ?", area)
+                else
+                  @businesses = @businesses.joins("
+                    JOIN departments ON educode_sales_businesses.department_id = departments.id
+                    JOIN schools ON departments.school_id = schools.id
+                  ").where("province = ?", area)
+              end
+            end
+          end
+
+          if params[:q].present? && params[:q][:date].present?
+            date = params[:q][:date].split(" - ")
+            @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1] + '23:59:59')
+          end
+
+          if params[:q].present? && params[:q][:sales_staff_id].present?
+            # 销售经理
+            @businesses = @businesses.joins("LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = educode_sales_businesses.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][:sales_staff_id], params[:q][:sales_staff_id])
+              
+          end
+
+          if params[:q].present? && params[:q][:after_sales_staff_id].present?
+            #  售后工程师
+            @businesses = @businesses.joins("LEFT JOIN educode_sales_assign_staffs ON educode_sales_assign_staffs.sourcable_type = 'EducodeSales::FollowUp' AND educode_sales_assign_staffs.sourcable_id = educode_sales_businesses.last_follow_up_id").
+                                      where("educode_sales_assign_staffs.staff_id = ?", params[:q][:after_sales_staff_id])
+              
+          end
+
+          # 商机变化
+          if params[:q][:clazz_changes].present?
+            clazz_changes = EducodeSales::BusinessClazzChange.clazz_changes_value[params[:q][:clazz_changes].to_s]
+            @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[:sort].present? && params[:sort][:field]
+            if params[:sort][:field] == "service_end_time"
+              @businesses = @businesses.order("service_time_long #{params[:sort][:order]}")
+            else
+              @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+            end
+          else
+            @businesses = @businesses.order("educode_sales_businesses.created_at desc")
+          end
+
+
+          @businesses = @businesses.select("
+            distinct
+            educode_sales_businesses.*,
+            last_follow.invitation_at,
+            last_follow.budget_amount,
+            last_follow.o_business_deployment,
+            last_follow.service_time_long,
+            last_follow.service_end_time,
+            last_follow.service_start_time,
+            last_follow.reception_at,
+            last_follow.bidded_date,
+            last_follow.signed_date,
+            last_follow.year,
+            last_follow.created_at as latest_time,
+            last_follow.actual_amount,
+            last_follow.divide_rate,
+            last_follow.divide_amount,
+            (last_follow.total_amount - last_follow.actual_amount) as divide_money,
+            (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
+            last_follow.total_amount,
+            total_follow_ups.follow_ups_counts
+            ").joins("
+            LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id AND last_follow.deleted_at IS NULL
+            LEFT JOIN (
+              SELECT COUNT(*) AS follow_ups_counts, educode_sales_follow_ups.business_id
+              FROM educode_sales_follow_ups
+              WHERE educode_sales_follow_ups.deleted_at IS NULL
+              GROUP BY educode_sales_follow_ups.business_id
+            ) AS total_follow_ups ON educode_sales_businesses.id = total_follow_ups.business_id
+          ").includes(:users, last_follow_up: [:clazz, :assign_follow_ups]).page(params[:page]).per(params[:limit])
+
+
+        end
+      end
+    end
+
+    def list
+      common = Common.find_by(clazz: 'staff_type', name: '销售')
+      staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11)
+      @staffs = staffs.map { |d| [d.user.real_name, d.id]}
+    end
+
+    def new_follow_up
+      @business = Business.find(params[:id])
+      @last_follow_up = @business.last_follow_up
+      @deployment_type = EducodeSales::FollowUp::BUSINESS_DEPLOYMENT
+      render layout: false
+    end
+
+
+    def follow_ups
+      authorize! :read_contract, Business
+      contract_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
+      @follow_ups = FollowUp.joins("
+        JOIN educode_sales_businesses ON educode_sales_follow_ups.business_id = educode_sales_businesses.id
+      ").where("educode_sales_follow_ups.stage_id in (?)", contract_ids)
+
+      if @current_admin.is_admin?
+        @follow_ups = @follow_ups
+      else
+        level = @current_admin.role.role_areas.find_by(clazz: '合同管理').level
+        case level
+        when '自己'
+          @follow_ups = @follow_ups.where("educode_sales_follow_ups.staff_id = ?", @current_admin.id)
+        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 = @follow_ups.where(business_id: business_ids)
+        end
+      end
+      if params[:q].present? && params[:q][:name].present?
+        @follow_ups = @follow_ups.joins(:business).where("educode_sales_businesses.name LIKE ?", "%#{params[:q][:name]}%")
+      end
+      if params[:q].present? && params[:q][:follows_date].present?
+        date = params[:q][:follows_date].split(" - ")
+        @follow_ups = @follow_ups.where("educode_sales_follow_ups.created_at > ? AND educode_sales_follow_ups.created_at < ?", date[0], date[1] + '23:59:59')
+      end
+      if params[:q].present? && params[:q][:staff_id].present?
+        @follow_ups = @follow_ups.where(staff_id: params[:q][:staff_id])
+      end
+      if params[:q].present? && params[:q][:department].present?
+        departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:q][:department]}%").pluck(:id)
+        @follow_ups = @follow_ups.joins(business: :department).where("departments.id in (?)", departments_ids)
+      end
+      if params[:q].present? && params[:q][:area].present?
+        p = EducodeSales::Common.find(params[:q][:area]).name
+        @follow_ups = @follow_ups.joins(business: :department).joins("
+          JOIN schools ON departments.school_id = schools.id
+        ").where("province = ?", p)
+      end
+
+      if params[:q].present? && params[:q][:description].present?
+        @follow_ups = @follow_ups.joins(:business).joins("JOIN educode_sales_businesses ON educode_sales_businesses.id = educode_sales_follow_ups.business_id
+                ").where("educode_sales_follow_ups.description LIKE ?" ,"%#{params[:q][:description]}%")
+
+      end
+
+      @follow_ups = @follow_ups.includes(:staff, :clazz, :stage, key_person: :teacher, business: [department: :school])
+
+      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
+
+    def add_follow_ups
+      p params["1_promise_date"]
+      p params["1_promise_date"].keys
+      params["1_promise_date"].each do |d, v|
+        p '-----22-'
+        p d
+        p v
+      end
+
+      render_success
+    end
+
+  end
+end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -16,7 +16,7 @@ module EducodeSales
             area_business_ids = []
             if permissions.include?("专项管理商机")
               # 按客户类型查看商机下跟进记录
-              school_tag_ids  = EducodeSales::StaffSchoolTag.where(staff_id: 10009).pluck :school_tag_id
+              school_tag_ids  = EducodeSales::StaffSchoolTag.where(staff_id: @current_admin.id).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

data/app/controllers/educode_sales/home_controller.rb

@@ -70,6 +70,13 @@ module EducodeSales
       end
     end
 
+    def staff_business
+      @schools = Business.all
+      if params[:q].present?
+        @schools = @schools.where("name like :q ", q: "%#{params[:q]}%").page(params[:page]).per(10)
+      end
+    end
+
     def staff_departments
       @departments = Department.where(school_id: params[:school_id])
       if params[:q].present?

data/app/controllers/educode_sales/ideas_controller.rb

@@ -10,12 +10,37 @@ module EducodeSales
         format.html do
           staff_ids = EducodeSales::Idea.all.pluck(:staff_id)
           creator_ids = EducodeSales::Idea.all.pluck(:creator_id)
+          sale_staff_ids = EducodeSales::Idea.all.pluck(:sale_staff_id)
           @creator_arr = EducodeSales::Staff.joins(:user).where(id: creator_ids).pluck("concat(users.lastname,users.firstname)", :id)
           @staff_arr = EducodeSales::Staff.joins(:user).where(id: staff_ids).pluck("concat(users.lastname,users.firstname)", :id)
+          @sale_staff_arr = EducodeSales::Staff.joins(:user).where(id: sale_staff_ids).pluck("concat(users.lastname,users.firstname)", :id)
         end
         format.json do
-          @ideas = Idea.not_deleted
+          @ideas = params[:is_deleted].to_s == "true" ? Idea.deleted : Idea.not_deleted
 
+          if @current_admin.is_admin?
+            @ideas = @ideas
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '方案管理').try(: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)
+              idea_ids = Idea.all.pluck(:other_staff_ids).flatten.uniq
+              @ideas = Idea.where("educode_sales_ideas.staff_id = ? OR educode_sales_ideas.id in (?)", @current_admin.id, idea_ids)
+            when '区域'
+              # 查看区域商机，需要排除掉其它人员手上的监管学校
+              other_staff_school_id = EducodeSales::StaffSchool.where.not(staff_id: @current_admin.id).where("school_id IN (SELECT school_id FROM educode_sales_staff_schools WHERE staff_id = #{@current_admin.id}) IS NOT TRUE").distinct.pluck :school_id
+
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id) - other_staff_school_id
+              idea_ids = Idea.all.pluck(:other_staff_ids).flatten.uniq
+              @ideas = @ideas.joins(department: :school).where("schools.id in (?) OR educode_sales_ideas.staff_id = ? OR educode_sales_ideas.id in (?)", school_ids, @current_admin.id, idea_ids)
+            else
+              @ideas = @ideas
+            end
+          end
+
+          @is_deleted = params[:is_deleted].to_s == "true"
           if params[:q] && params[:q][:created_at].present?
             date = params[:q][:created_at].split(" - ")
             @ideas = @ideas.where("educode_sales_ideas.created_at >= ? AND educode_sales_ideas.created_at <= ?", date[0] + " 00:00:00", date[1] + " 23:59:59")
@@ -32,6 +57,10 @@ module EducodeSales
           if params[:q].present? && params[:q][:staff_id].present?
             @ideas = @ideas.where("educode_sales_ideas.staff_id = ?", params[:q][:staff_id].to_i)
           end
+          if params[:q].present? && params[:q][:search_sale_staff_id].present?
+            @ideas = @ideas.where("educode_sales_ideas.sale_staff_id = ?", params[:q][:search_sale_staff_id].to_i)
+          end
+
           if params[:q].present? && params[:q][:status].present?
             @ideas = @ideas.where(status: params[:q][:status])
           end
@@ -66,14 +95,29 @@ module EducodeSales
       render layout: false
     end
 
+    def update_advise
+      # followup = FollowUp.find(params[:id])
+      # followup.update(advise: params[:content])
+      # render_success
+      idea = Idea.find(params[:id])
+      idea.update(advise: params[:content])
+      render_success
+    end
+
     def create
       idea = Idea.new(idea_params)
       # idea.school_id = Department.find_by_id(idea.department_id)&.school_id
       idea.creator = current_user
       assist_staff_ids = Array(params[:assist_staff_ids].to_s.split(","))
       attachment_ids = Array(params[:attachment_ids].to_s.split(","))
+      other_staff_ids = Array(params[:other_staff_ids].to_s.split(","))
+      if idea.business_id.present?
+        idea.school_id = idea.business&.department&.school_id
+        idea.department_id = idea.business&.department_id
+      end
       idea.attachment_ids = attachment_ids
       idea.assist_staff_ids = assist_staff_ids
+      idea.other_staff_ids = other_staff_ids
       idea.save
       render_success
     end
@@ -93,6 +137,12 @@ module EducodeSales
       @idea.assist_staff_ids = assist_staff_ids
       attachment_ids = Array(params[:attachment_ids].to_s.split(","))
       @idea.attachment_ids = attachment_ids
+      other_staff_ids = Array(params[:other_staff_ids].to_s.split(","))
+      @idea.other_staff_ids = other_staff_ids
+      if @idea.business_id.present?
+        @idea.school_id = @idea.business&.department&.school_id
+        @idea.department_id = @idea.business&.department_id
+      end
       check_changes
       @idea.save
       render_success
@@ -114,16 +164,110 @@ module EducodeSales
       gon.value = @idea.department_id
       gon.department_list = @idea.department.present? ? [{ name: @idea.department.name, value: @idea.department_id }] : []
       gon.school_list = @idea.school.present? ? [{ name: @idea.school.name, value: @idea.school_id }] : []
+      gon.business_list = @idea.business.present? ? [{ name: @idea.business.name, value: @idea.business_id }] : []
+      gon.other_staff_value = @idea.other_staffs.map { |d| { name: d&.user&.real_name, value: d.id } }
+      render layout: false
+    end
+
+    def show_teachers
+      render layout: false
+    end
+
+    def upload_file
       render layout: false
     end
 
+    def show_schools
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+          @data = EducodeSales::ActivityTeacher.joins(teacher: [department: :school]).where(idea_id: params[:id]).select("count(teacher_id) AS teachers_count, departments.name AS department, schools.name AS school, school_id").group("school_id")
+          @data = @data.distinct.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def new_follow_up
+      @idea = Idea.find(params[:id])
+      gon.staffs = Staff.where.not(role_id: 11).includes(:user).map { |d| { name: d.user.real_name, value: d.id } }
+      render layout: false
+    end
+
+    def follow_up
+      idea = Idea.find(params[:id])
+      follow_up = IdeaFollow.new(idea_id: idea.id, staff_id: @current_admin.id, money: params[:money], content: params[:content], status: params[:status], advise: params[:advise], sale_staff_id: params[:sale_staff_id], idea_staff_id: params[:idea_staff_id])
+      if follow_up.save
+        idea.last_idea_follow_id = follow_up.id
+        idea.save
+        render_success
+      else
+        render_failure follow_up
+      end
+
+    end
+
+    def follow_ups
+      @data = IdeaFollow
+      if params[:q] && params[:q][:search_name].present?
+        @data = @data.left_joins(idea: :business).where("educode_sales_businesses.name like ?", "%#{params[:q][:search_name]}%")
+                     .or(@data.left_joins(idea: :business).where("educode_sales_ideas.name like ?", "%#{params[:q][:search_name]}%"))
+      end
+      if params[:q] && params[:q][:search_school].present?
+        @data = @data.joins(idea: [department: :school]).where("schools.name like ?", "%#{params[:q][:search_school]}%")
+      end
+      if params[:q] && params[:q][:search_sale_staff_id].present?
+        @data = @data.where(sale_staff_id: params[:q][:search_sale_staff_id])
+      end
+      if params[:q] && params[:q][:search_idea_staff].present?
+        @data = @data.where(idea_staff_id: params[:q][:search_idea_staff])
+      end
+      if params[:q] && params[:q][:search_created_at].present?
+        @data = @data.where("educode_sales_idea_follows.created_at >= ? and educode_sales_idea_follows.created_at <= ?", params[:q][:search_created_at].split(" - ")[0], params[:q][:search_created_at].split(" - ")[1])
+      end
+      if params[:q] && params[:q][:search_content].present?
+        @data = @data.where("educode_sales_idea_follows.content like ?", "%#{params[:q][:search_content]}%")
+      end
+      # if params[:sort].present? && params[:sort][:field]
+      #   @data = @data.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+      # else
+      #   @data = @data.order("educode_sales_idea_follows.created_at desc")
+      # end
+      @data = @data.distinct.page(params[:page]).per(params[:limit])
+    end
+
+    def add_advise
+      followup = IdeaFollow.find(params[:id])
+      followup.update(advise: params[:content])
+      render_success
+    end
+
+    def files
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+          idea = Idea.find(params[:id])
+          @files = idea.files
+          if params[:sort].present? && params[:sort][:field]
+            @files = @files.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @files = @files.order("created_on desc")
+          end
+          @files = @files.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
     private
 
     def idea_params
       params.permit(:name, :level, :staff_id,
                     :status, :types, :model, :hardware, :project,
                     :money, :end_time, :content, :department_id, :school_id,
-                    :manager_name, :manager_phone, :school_name, :department_name, :sale_staff_id, :attachment_id)
+                    :manager_name, :manager_phone, :school_name, :department_name, :sale_staff_id, :attachment_id, :idea_type, :business_id)
     end
 
     def find_idea
@@ -145,79 +289,5 @@ module EducodeSales
       end
     end
 
-    # def upload_file(file)
-    #   folder = File.join(Rails.root, "public", "files", 'educode_sales')
-    #   upload_file = file
-    #   raise "未上传文件" unless upload_file
-    #   save_path = File.join(folder)
-    #   ext = file_ext(upload_file.original_filename)
-    #   local_path, digest = file_save_to_local(save_path, upload_file.tempfile, ext)
-    #   content_type = upload_file.content_type.presence || 'application/octet-stream'
-    #   disk_filename = local_path[save_path.size + 1, local_path.size]
-    #   @attachment = Attachment.where(disk_filename: disk_filename,
-    #                                  author_id: current_user.id).first
-    #   if @attachment.blank?
-    #     @attachment = Attachment.new
-    #     @attachment.filename = upload_file.original_filename
-    #     @attachment.description = "popup_windows"
-    #     @attachment.disk_filename = local_path[save_path.size + 1, local_path.size]
-    #     @attachment.filesize = upload_file.tempfile.size
-    #     @attachment.content_type = content_type
-    #     @attachment.digest = digest
-    #     @attachment.author_id = current_user.id
-    #     @attachment.container_id = current_user.id
-    #     @attachment.save!
-    #   else
-    #     logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"
-    #   end
-    #   @attachment.id
-    #   # render_ok
-    # end
-    # def edu_setting name
-    #   EduSetting.get(name)
-    # end
-    #
-    #
-    # def file_ext(file_name)
-    #   ext = ''
-    #   exts = file_name.split(".")
-    #   if exts.size > 1
-    #     ext = ".#{exts.last}"
-    #   end
-    #   ext
-    # end
-    #
-    # def file_save_to_local(save_path, temp_file, ext)
-    #   unless Dir.exists?(save_path)
-    #     FileUtils.mkdir_p(save_path) ##不成功这里会抛异常
-    #   end
-    #
-    #   digest = md5_file(temp_file)
-    #   digest = "#{digest}_#{(Time.now.to_f * 1000).to_i}"
-    #   local_file_path = File.join(save_path, digest) + ext
-    #   save_temp_file(temp_file, local_file_path)
-    #
-    #   [local_file_path, digest]
-    # end
-    #
-    #
-    # def md5_file(temp_file)
-    #   md5 = Digest::MD5.new
-    #   temp_file.rewind
-    #   while (buffer = temp_file.read(8192))
-    #     md5.update(buffer)
-    #   end
-    #   md5.hexdigest
-    # end
-    #
-    # def save_temp_file(temp_file, save_file_path)
-    #   File.open(save_file_path, 'wb') do |f|
-    #     temp_file.rewind
-    #     while (buffer = temp_file.read(8192))
-    #       f.write(buffer)
-    #     end
-    #   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/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