educode_sales 0.6.1 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88c76bb62d36b9922c99d80e365218b4dbde3bfe9632773d71ba40bdda28ef2f
-  data.tar.gz: 4ba6723ac69f19bb92c57a876b1e7c7299fc15bf1d213eede7ce215e12a932bc
+  metadata.gz: abfb5bbc3cbbe65b1c987c9e1b77bca81d06086e2db8b6c788163fdba557f2ef
+  data.tar.gz: 7e2a1aabfab1f07c614a76d65f33560f6da3e7d05200a819c4d7b905c5d976c3
 SHA512:
-  metadata.gz: 608ee9cf6238d241410cb879004c9d18d5ee4e2fa346f285a6f81e3391b3438b905997dbc03c5b37c83c1c9dbd5f2cda1c7f11c3c831c3f986ceda2b443fe925
-  data.tar.gz: 0f5c04324244916fe4a6fd75625076b8ae56bf6398f04676d168b41af251dd66b0db586f53881bbb68ddfaebef7d0ef95d0b47f790b64ed34729c57b5533d856
+  metadata.gz: 30bac077609756d5eb7ab205d40f2c3f2b7db4f88797c636038051316c1917af74a88f4cf390878c6b8adc83f4bf4e417d723ef349ecdbfc375a8176e5a3a6a8
+  data.tar.gz: 3b4b074197ba779c5b8f8134e97b1633f6173f8ba7a46232d761b132b123b1ffa1ac39fa1b47d484ce82197d060b02dbde8bf8d07fb9c1c5bff1e783d3b485e6

data/app/controllers/educode_sales/businesses_controller.rb

@@ -33,15 +33,25 @@ module EducodeSales
         format.html do
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
-          @more = can?(:create, EducodeSales::SalePlan) || can?(:update, EducodeSales::Business) || can?(:destroy, EducodeSales::Business)
+          # @more = can?(:create, EducodeSales::SalePlan) || can?(:update, EducodeSales::Business) || can?(:destroy, EducodeSales::Business) || can?(:show_file, EducodeSales::Business)
+          @more = true
           gon.menus = []
           gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
+          gon.business_type = Common.where(clazz: 'business_type').map do |d|
+            {value: d.id, name: d.name}
+          end
+          gon.type = params[:clazz_id].present? ? [{ value: params[:clazz_id], name: Common.find(params[:clazz_id]).name }] : []
+          gon.business_step = Common.where(clazz: 'business_step').map do |d|
+            {value: d.id, name: d.name}
+          end
           if can?(:create, EducodeSales::SalePlan)
             gon.menus << { title: '添加周计划', event: 'week' }
             gon.menus << { title: '添加月计划', event: 'month' }
           end
           gon.menus << { title: '跟进时间线', event: 'time_line' }
-          gon.menus << { title: '附件管理', event: 'file' }
+          if can?(:show_file, EducodeSales::Business)
+            gon.menus << { title: '附件管理', event: 'file' }
+          end
           if can?(:update, EducodeSales::Business)
             gon.menus << { title: '编辑', event: 'edit' }
           end
@@ -76,7 +86,9 @@ module EducodeSales
             b_id = Common.find_by(extras: EducodeSales::Common::BTYPE)&.id
             c_id = Common.find_by(extras: EducodeSales::Common::CTYPE)&.id
             d_id = Common.find_by(extras: EducodeSales::Common::DTYPE)&.id
-            ids = [a_id ,b_id ,c_id ,d_id]
+            e_id = Common.find_by(extras: EducodeSales::Common::ETYPE)&.id
+            o_id = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
+            ids = [a_id ,b_id ,c_id ,d_id ,e_id ,o_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.clazz_id in (?)",ids)
@@ -135,12 +147,12 @@ module EducodeSales
           if params[:q].present? && params[:q][:business_type].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.clazz_id = ?", params[:q][:business_type])
+            ").where("educode_sales_follow_ups.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 = ?", params[:q][:business_step])
+            ").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("
@@ -172,7 +184,14 @@ module EducodeSales
 
           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])
+            @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][:invitation_at].present?
+            date = params[:q][:invitation_at].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.invitation_at > ? AND educode_sales_follow_ups.invitation_at < ?", date[0] + '00:00:00', date[1] + '23:59:59')
           end
 
           if params[:sort].present? && params[:sort][:field]
@@ -191,7 +210,9 @@ module EducodeSales
             last_follow.reception_at,
             last_follow.bidded_date,
             last_follow.signed_date,
+            last_follow.created_at as latest_time,
             last_follow.actual_amount,
+            (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
             last_follow.total_amount").joins("
             LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
           ").page(params[:page]).per(params[:limit])
@@ -201,7 +222,7 @@ module EducodeSales
 
     def create
       department = Department.find(params[:department_id])
-      business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source])
+      business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id)
       if business.save
         render_success
       else
@@ -223,7 +244,7 @@ module EducodeSales
     def update
       business = Business.find(params[:id])
       department = Department.find(params[:department_id])
-      if business.update(name: params[:name], department_id: department.id, source: params[:source])
+      if business.update(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id)
         render_success
       else
         render_failure business

data/app/controllers/educode_sales/customers_controller.rb

@@ -2,8 +2,6 @@ require_dependency "educode_sales/application_controller"
 
 module EducodeSales
   class CustomersController < ApplicationController
-    # before_action :find_school, only: [:edit, :update]
-    # before_action :must_admin!, only: [:destroy]
 
     def new_department
       render layout: false
@@ -43,7 +41,7 @@ module EducodeSales
         end
         format.json do
           if @current_admin.is_admin?
-            @customers = School
+            @customers = School.all
           else
             level = @current_admin.role.role_areas.find_by(clazz: '客户管理').level
             case level
@@ -56,7 +54,7 @@ module EducodeSales
               school_ids = a_school_ids + b_school_ids
               @customers = School.where(id: school_ids)
             else
-              @customers = School
+              @customers = School.all
             end
           end
 
@@ -71,21 +69,29 @@ module EducodeSales
             @customers = @customers.where(id: school_ids)
           end
 
-          # if params[:q].present? && params[:q][:date].present?
-          #   department_ids =
-          #   business_ids = EducodeSales::Business.where(department_id: department_ids).ids
-          #   follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
-          #   customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
-          #   a_last_follow_time = follow_ups.last&.created_at&.to_s(:date)
-          #   b_last_follow_time = customer_follows.last&.created_at&.to_s(:date)
-          #   if a_last_follow_time.present? && b_last_follow_time.present?
-          #     json.last_follow_time a_last_follow_time < b_last_follow_time ? b_last_follow_time : a_last_follow_time
-          #   else
-          #     json.last_follow_time a_last_follow_time || b_last_follow_time
-          #   end
-          #   date = params[:q][:date].split(" - ")
-          #   @customers = @customers.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1])
-          # end
+          if params[:q].present? && params[:q][:date].present?
+            ids = EducodeSales::CustomerFollow.all.pluck(:school_id)
+            @customers = @customers.where(id: ids)
+            school_ids =[]
+            date = params[:q][:date].split(" - ")
+            @customers.each do |d|
+              business_ids = EducodeSales::Business.where(school_id: d.id).ids
+              follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
+              customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
+              next if follow_ups.blank? && customer_follows.blank?
+              a_last_follow_time = follow_ups.last&.created_at&.to_s
+              b_last_follow_time = customer_follows.last&.created_at&.to_s
+              if a_last_follow_time.present? && b_last_follow_time.present?
+                last_follow_time = ((a_last_follow_time < b_last_follow_time) ? b_last_follow_time : a_last_follow_time)
+              else
+                last_follow_time = (a_last_follow_time || b_last_follow_time)
+              end
+              if last_follow_time.present? && last_follow_time > date[0] && last_follow_time < date[1]
+                school_ids << d.id
+              end
+            end
+            @customers = @customers.where(id: school_ids)
+          end
 
           @customers = @customers.order(id: :desc).page(params[:page]).per(params[:limit])
         end
@@ -109,11 +115,6 @@ module EducodeSales
         format.json do
           @follow_ups = EducodeSales::CustomerFollow.where(school_id: params[:id])
           @latest = @follow_ups.order(created_at: :desc).first
-          # if params[:field]
-          #   @follow_ups = @follow_ups.order("#{params[:field]} #{params[:order]}")
-          # else
-          #   @follow_ups = @follow_ups.order("created_at desc")
-          # end
           @follow_ups = @follow_ups.order("created_at desc")
           @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
         end
@@ -122,11 +123,6 @@ module EducodeSales
 
     def show_department
       @departments = School.find(params[:id]).departments
-      # if params[:field]
-      #   @follow_ups = @follow_ups.order("#{params[:field]} #{params[:order]}")
-      # else
-      #   @follow_ups = @follow_ups.order("created_at desc")
-      # end
       @departments = @departments.order("created_at desc")
       @departments = @departments.page(params[:page]).per(params[:limit])
     end
@@ -154,40 +150,55 @@ module EducodeSales
     end
 
     def create
-      @school = School.find(params[:id])
       ActiveRecord::Base.transaction do
-        property = SchoolProperty.find_or_create_by!(school_property_params)
+        property = SchoolProperty.find_or_create_by!(project_985: params[:project_985].present? ? 1 : 0,
+                                                     project_211: params[:project_211].present? ? 1 : 0,
+                                                     regular_college: params[:regular_college].present? ? 1 : 0,
+                                                     junior_college: params[:junior_college].present? ? 1 : 0,
+                                                     secondary_school: params[:secondary_school].present? ? 1 : 0,
+                                                     military_school: params[:military_school].present? ? 1 : 0,
+                                                     enterprise: params[:enterprise].present? ? 1 : 0)
         @school = School.new
         @school.attributes = school_params
         @school.school_property = property
         @school.save!
+        EducodeSales::CustomerExtension.create(customer_staff_id: @current_admin.id, school_id: @school.id)
       end
+      render_success
     end
 
     def edit
       @school = School.find(params[:id])
+      @school_property = @school.school_property
       render layout: false
     end
 
     def update
       @school = School.find(params[:id])
       ActiveRecord::Base.transaction do
-        property = SchoolProperty.find_or_create_by!(school_property_params)
+        property = SchoolProperty.find_or_create_by!(project_985: params[:project_985].present? ? 1 : 0,
+                                                     project_211: params[:project_211].present? ? 1 : 0,
+                                                     regular_college: params[:regular_college].present? ? 1 : 0,
+                                                     junior_college: params[:junior_college].present? ? 1 : 0,
+                                                     secondary_school: params[:secondary_school].present? ? 1 : 0,
+                                                     military_school: params[:military_school].present? ? 1 : 0,
+                                                     enterprise: params[:enterprise].present? ? 1 : 0)
         @school.attributes = school_params
         @school.school_property = property
         @school.save!
       end
+      render_success
     end
 
     private
 
 
     def school_property_params
-      params.require(:school).permit(:project_985, :project_211, :regular_college, :junior_college, :secondary_school, :military_school, :enterprise)
+      params.permit(:project_985, :project_211, :regular_college, :junior_college, :secondary_school, :military_school, :enterprise)
     end
 
     def school_params
-      params.require(:school).permit(:name, :province, :city, :address)
+      params.permit(:name, :province, :city, :address)
     end
 
   end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -34,7 +34,7 @@ module EducodeSales
           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])
+            @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])

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -0,0 +1,65 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class MoneyPlansController < ApplicationController
+
+    def index
+      follow_up_ids = Business.pluck(:last_follow_up_id)
+      authorize! :read, MoneyPlan
+      respond_to do |format|
+        format.html do
+          common = Common.find_by(clazz: 'staff_type', name: '销售')
+          @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
+        end
+        format.json do
+          x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+          if @current_admin.is_admin?
+            @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids)
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '回款管理').level
+            case level
+            when '自己'
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.staff_id)
+            when '区域'
+              a_ids = MoneyPlan.where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.staff_id).ids
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+              b_ids = Business.where(school_id: school_ids).pluck(:last_follow_up_id)
+              ids = a_ids + b_ids
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(id: ids)
+            else
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids)
+            end
+          end
+
+          if params[:q].present? && params[:q][:business].present?
+            follow_up_ids = Business.where("name like ?", "%#{params[:q][:business]}%").pluck(:last_follow_up_id)
+            @money_plans = @money_plans.where(follow_up_id: follow_up_ids)
+          end
+          if params[:q].present? && params[:q][:school].present?
+            school_ids = School.where("name like ?", "%#{params[:q][:school]}%").pluck(:id)
+            follow_up_ids = Business.where(school_id: school_ids).pluck(:last_follow_up_id)
+            @money_plans = @money_plans.where(follow_up_id: follow_up_ids)
+          end
+          if params[:q].present? && params[:q][:staff_id].present?
+            @money_plans = @money_plans.where(staff_id: params[:q][:staff_id])
+          end
+          if params[:q].present? && params[:q][:clazz].present?
+            @money_plans = @money_plans.where(clazz: params[:q][:clazz])
+          end
+          if params[:q].present? && params[:q][:date].present?
+            date = params[:q][:date].split(" - ")
+            @money_plans = @money_plans.where("educode_sales_money_plans.date_at >= ? AND educode_sales_money_plans.date_at < ?", date[0], date[1] + '23:59:59')
+          end
+
+          if params[:sort].present? && params[:sort][:field]
+            @money_plans = @money_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @money_plans = @money_plans.order(date_at: :desc)
+          end
+          @total_amount = @money_plans.sum(:amount)
+          @money_plans = @money_plans.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+  end
+end

data/app/controllers/educode_sales/places_controller.rb

@@ -8,7 +8,11 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @places = Place.page(params[:page]).per(params[:limit])
+          @places = EducodeSales::Place.all
+          if params[:q].present? && params[:q][:name].present?
+            @places = @places.where("name like ?", "%#{params[:q][:name]}%")
+          end
+          @places = @places.page(params[:page]).per(params[:limit])
           @x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
           @stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
         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'}])
+      role.role_areas.build([{ clazz: 'Business' }, { clazz: 'SalePlan' }, { clazz: 'Teacher' }, { clazz: 'Operation' }, {clazz:'Customer'}, {clazz:'MoneyPlan'}])
       if role.save
         render_success
       else
@@ -81,6 +81,9 @@ module EducodeSales
       r = role.role_areas.find_or_initialize_by(clazz: 'Customer')
       r.level = params[:customer]
       r.save
+      r = role.role_areas.find_or_initialize_by(clazz: 'MoneyPlan')
+      r.level = params[:money_plan]
+      r.save
       render_success
     end
 

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -13,7 +13,7 @@ module EducodeSales
       x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
       o = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
       @sale_trend = SaleTrend.find_or_create_by(year: @year)
-      @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).sum(:total_amount).round(2)
+      @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).sum(:total_amount).round(2)
       stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
       @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids).sum(:total_amount).round(2)
       @actual_goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids).sum(:actual_amount).round(2)
@@ -72,6 +72,49 @@ module EducodeSales
         end
       end
 
+      #商机区域分布图表
+      provinces = EducodeSales::Common.where(clazz: 'area').pluck(:name)
+      if params[:business_count_type] == 'money' || params[:business_count_type].blank?
+        @business_data =  {
+          labels: provinces,
+          datasets:[
+            {
+              label: "商机总额",
+              data: provinces.map{|province|
+                if params[:business_type].blank?
+                  Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ?", x).sum(:total_amount).round(2)
+                else
+                  Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id = ?", params[:business_type]).sum(:total_amount).round(2)
+                end
+              },
+              backgroundColor: colors[0],
+              borderColor: colors[0],
+              borderWidth: 1
+            }
+          ]
+        }
+      else
+        @business_data =  {
+          labels: provinces,
+          datasets:[
+            {
+              label: "商机数量",
+              data: provinces.map{|province|
+                if params[:business_type].blank?
+                  Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ?", x).count
+                else
+                  Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id = ?", params[:business_type]).count
+                end
+              },
+              backgroundColor: colors[0],
+              borderColor: colors[0],
+              borderWidth: 1
+            }
+          ]
+        }
+      end
+
+
 
       # 已中标图表
       goal_default_dates = ("#{Time.now.year}-01".."#{Time.now.year}-#{Time.now.month}").to_a

data/app/controllers/educode_sales/staffs_controller.rb

@@ -67,14 +67,13 @@ module EducodeSales
 
     def follow_up_schools
       staff = Staff.find(params[:id])
-      # @schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_follow_ups.updated_at) AS updated_at").page(params[:page]).per(params[:limit])
-      @schools = EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_teacher_follows.updated_at) AS updated_at")+EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_follow_ups.updated_at) AS updated_at")
-      @count =  EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").count
+      @schools = EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{staff.id}").group("departments.school_id").select("departments.school_id, max(educode_sales_teacher_follows.updated_at) AS updated_at") + EducodeSales::Business.joins(:follow_ups, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("departments.school_id").select("departments.school_id, max(educode_sales_follow_ups.updated_at) AS updated_at")
+      @count =  EducodeSales::Business.joins(:follow_ups, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("departments.school_id").count
     end
 
     def follow_up_departments
       staff = Staff.find(params[:id])
-      @schools = EducodeSales::Business.joins(:last_follow_up, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.id}").select("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.name, schools.name AS school, educode_sales_teacher_follows.updated_at")
+      @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
 
 

data/app/controllers/educode_sales/teachers_controller.rb

@@ -113,10 +113,21 @@ module EducodeSales
             @teachers = @teachers.where("educode_sales_teachers.created_at > ? AND educode_sales_teachers.created_at < ?", date[0], date[1])
           end
 
-          @teachers = @teachers.order("educode_sales_teachers.created_at desc").page(params[:page]).per(params[:limit])
+          @teachers = @teachers.select("
+            educode_sales_teachers.*,
+            users.created_on,
+            users.last_login_on").joins("
+            LEFT JOIN users ON educode_sales_teachers.user_id = users.id
+          ")
+          if params[:sort].present? && params[:sort][:field]
+            @teachers = @teachers.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @teachers = @teachers.order("educode_sales_teachers.created_at desc")
+          end
+          @teachers = @teachers.page(params[:page]).per(params[:limit])
+        end
 
         end
-      end
     end
 
     def import

data/app/models/educode_sales/permission.rb

@@ -1,7 +1,7 @@
 module EducodeSales
   class Permission < ApplicationRecord
     enum clazz: {
-      '市场态势': 'market',
+      '销售态势': 'market',
       '销售分工': 'sale_job',
       '商机管理': 'business',
       '渠道管理': 'place',
@@ -11,7 +11,8 @@ module EducodeSales
       '教师运营': 'teacher',
       '活动运营': 'activity',
       '运营计划': 'operation_plan',
-      '客户管理': 'customer'
+      '客户管理': 'customer',
+      '回款管理': 'money_plan'
     }
   end
 end

data/app/models/educode_sales/role_area.rb

@@ -9,6 +9,7 @@ module EducodeSales
       '教师运营': 'Teacher',
       '运营计划': 'Operation',
       '客户管理': 'Customer',
+      '回款管理': 'MoneyPlan'
     }
   end
 end

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

@@ -55,6 +55,9 @@
 <script type="text/html" id="business">
   <a href="javascript:void(0);" lay-event="business" class="layui-table-link">{{ d.business }}</a>
 </script>
+<script type="text/html" id="school">
+  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</a>
+</script>
 
 
 <script>
@@ -97,10 +100,16 @@
                         templet:'<div><span title="{{d.description}}">{{d.description}}</span></div>'
                     },
                     {
-                        field: 'advise',
+                        field: 'business',
                         width: 120,
-                        title: '团队建议',
-                        templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
+                        title: '所属商机',
+                        templet:'#business'
+                    },
+                    {
+                        field: 'school',
+                        width: 120,
+                        title: '单位',
+                        templet:'#school'
                     },
                     {
                         field: 'clazz',
@@ -114,24 +123,18 @@
                         width: 90,
                         templet:'<div><span title="{{d.stage}}">{{d.stage}}</span></div>'
                     },
+                    {
+                        field: 'advise',
+                        width: 120,
+                        title: '团队建议',
+                        templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
+                    },
                     {
                         field: 'key_people',
                         width: 90,
                         title: '关键人',
                         templet:'<div><span title="{{d.key_people}}">{{d.key_people}}</span></div>'
                     },
-                    {
-                        field: 'business',
-                        width: 120,
-                        title: '所属商机',
-                        templet:'#business'
-                    },
-                    {
-                        field: 'school',
-                        width: 120,
-                        title: '单位',
-                        templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
-                    },
                     {
                         field: 'staff',
                         width: 90,

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

@@ -11,6 +11,9 @@
       <label class="layui-form-label required">单位部门</label>
       <div class="layui-input-block" id="department" style="width: 300px;"></div>
     </div>
+    <div class="layui-inline" >
+      <a href="/missions/customers" style=" color: #0000FF">添加单位/部门</a>
+    </div>
     <br>
     <div class="layui-inline" style="padding-top: 20px">
       <label class="layui-form-label ">商机来源</label>

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

@@ -69,12 +69,14 @@
       <div class="layui-input-inline">
         <input name="total_amount" type="number" class="layui-input" value="<%= @follow_up.total_amount %>">
       </div>
-    </div>
+      客户采购支出的费用。总额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。    </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
          <input name="actual_amount" type="number" class="layui-input" placeholder="本单位的签单金额" value="<%= @follow_up.actual_amount %>">
       </div>
+      客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
     <br>
     <div class="layui-inline place_select">
@@ -82,7 +84,9 @@
       <div class="layui-input-inline" style="z-index: 101">
         <div id="edit_place" style="width: 190px;"></div>
       </div>
+    总额里，渠道拿到的部分。
     </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
@@ -95,7 +99,8 @@
         <div class="layui-input-inline">
           <input type="text" class="layui-input" name="year"  lay-verify="required" autocomplete="off" id="edit_year"
                  value="<%= @follow_up&.year%>"
-                 placeholder="请选择年度">      </div>
+                 placeholder="请选择年度">
+        </div>
       </div>
     </div>
     <div class="layui-form-item">
@@ -103,6 +108,10 @@
       <div class="layui-input-inline">
         <div id="edit_assign_follow" style="width: 512px;"></div>
       </div>
+      <div class="layui-inline" style="padding: 9px 15px">
+        <label class="layui-form-label" style="padding-left: 220px"></label>
+        指定跟进人和商机创建者，同时拥有对该商机的管理权限
+      </div>
     </div>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label required">最新进展</label>