educode_sales 0.4.3 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb60117f75870a9280a833425b4a29bac7172e70da78b061fa41ea92abc7c985
-  data.tar.gz: 203aaf0c96f4e246ab734cd3dc4844542563404f6939bc2613ae286fe37d8be7
+  metadata.gz: 2e609ed864a33df3f8398ab53416e7652333965a094df7965414cd93058e0965
+  data.tar.gz: b506ac92b247f3bbdebb03ffa7e5d7e4c5bd48d0ac4e68a01919d81137cf175d
 SHA512:
-  metadata.gz: 688e3848050cd08d8598e8434e0039db4aa6fb0972f3bd558ad026b68462080fe898802082f94dfcf67b7e3a765631ecc39befad5382028c30c0b4259fb4e045
-  data.tar.gz: 5ed1048e97b6cf03f127040239eb7a7c8011b72edf8a94deb42d65a829a4e7ed15b98ecb94bdeb662dc6dc66efe3fff6e22cfeef28d819082a8f8ce9879cfeee
+  metadata.gz: 5ef7c7f3635c83459308d71cc80e89a6f1e45b38e0fec1c65d53fe469f4fb4d75a5b1c2982cd04c7cf4fc66299742275b8fe1f655f6f656f525fb40abceac5b0
+  data.tar.gz: 943c29ffb564e3cc318c3bc55ce6daf4dd08e5986039f463abac740d6626d6e6b062300280e0b015cc4ce31114ffe913350e0ec95540cdf70add0ee000ac0bc2

data/app/controllers/educode_sales/businesses_controller.rb

@@ -40,6 +40,16 @@ module EducodeSales
             end
           end
 
+          if params[:q].present? && params[:q][:all].present?
+            @businesses = @businesses
+          end
+
+          if params[:q].present? && params[:q][:mine].present?
+            ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+            ids1 = FollowUp.where(id: ids).pluck(:business_id)
+            @businesses =@businesses.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id)
+          end
+
           @businesses = @businesses
           if params[:q].present? && params[:q][:name].present?
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
@@ -49,7 +59,12 @@ module EducodeSales
             @businesses = @businesses.joins(:department).where("departments.id in (?)", departments_ids)
           end
           if params[:q].present? && params[:q][:staff_id].present?
-            @businesses = @businesses.where(staff_id: params[:q][:staff_id])
+            part_a_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is null AND 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]).pluck(:business_id)
+            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.joins("
@@ -88,17 +103,7 @@ module EducodeSales
 
           @business_count = @businesses.count
 
-          if params[:q].present? && params[:q][:all].present?
-            @businesses = Business.all
-          end
 
-          if params[:q].present? && params[:q][:mine].present?
-            ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
-            ids1 = FollowUp.where(id: ids).pluck(:business_id)
-            ids2 = Business.where(staff_id: @current_admin.id).pluck(:id)
-            # @businesses = Business.where(id: ids1+ids2)
-            @businesses =Business.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id)
-          end
 
           @businesses = @businesses.select("
             educode_sales_businesses.*,
@@ -235,7 +240,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_rate, :description, :advise, :place_id)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id)
     end
 
   end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -156,7 +156,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_rate, :description, :advise, :place_id)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id)
     end
 
     def teacher_params

data/app/controllers/educode_sales/home_controller.rb

@@ -33,6 +33,10 @@ module EducodeSales
       @data += User.joins(:user_extension).where.not(id: user_ids).where("identity='teacher'", user_ids).where("lastname like ?", "%#{params[:q]}%").limit(50)
     end
 
+    def search_operation_teacher
+      @data = Teacher.where("name like ? and is_key = false", "%#{params[:q]}%").limit(20)
+    end
+
     def search_edu_teacher
       @data = User.joins(:user_extension).where("identity='teacher'").where("concat(lastname, firstname) like :q OR phone like :q OR mail like :q", q: "%#{params[:q]}%").limit(50)
     end

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -21,7 +21,7 @@ module EducodeSales
               @sale_plans = OperationPlan.where(staff_id: @current_admin.id)
             when '区域'
               staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
-              @sale_plans = OperationPlan.where("staff_id in (?)", staff_ids)
+              @sale_plans = OperationPlan.where("staff_id in (?) OR educode_sales_operation_plans.staff_id = ?", staff_ids, @current_admin.id)
             else
               @sale_plans = OperationPlan
             end
@@ -44,7 +44,7 @@ module EducodeSales
           if params[:sort].present? && params[:sort][:field]
             @sale_plans = @sale_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
-            @sale_plans = @sale_plans.order("updated_at desc")
+            @sale_plans = @sale_plans.order("created_at desc")
           end
           @sale_plans = @sale_plans.page(params[:page]).per(params[:limit])
         end
@@ -77,6 +77,8 @@ module EducodeSales
     end
 
     def new_weekly
+      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      @name = @current_admin.user.real_name
       sale_plans = OperationPlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", weekly: Time.now.strftime('%W').to_i, staff_id: @current_admin.id)
       @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
       @departments_count = sale_plans.joins(:teacher).count("distinct(department_id)")
@@ -92,6 +94,8 @@ module EducodeSales
     end
 
     def new_monthly
+      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      @name = @current_admin.user.real_name
       sale_plans = OperationPlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", staff_id: @current_admin.id, weekly: nil)
       @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
       @departments_count = sale_plans.joins(:teacher).count("distinct(department_id)")

data/app/controllers/educode_sales/operation_reports_controller.rb

@@ -18,7 +18,7 @@ module EducodeSales
               @sale_reports = OperationReport.where(staff_id: @current_admin.id)
             when '区域'
               staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
-              @sale_reports = OperationReport.where("staff_id in (?)", staff_ids)
+              @sale_reports = OperationReport.where("staff_id in (?) OR educode_sales_operation_reports.staff_id = ?", staff_ids, @current_admin.id)
             else
               @sale_reports = OperationReport
             end
@@ -40,7 +40,7 @@ module EducodeSales
           if params[:sort].present? && params[:sort][:field]
             @sale_reports = @sale_reports.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
-            @sale_reports = @sale_reports.order("updated_at desc")
+            @sale_reports = @sale_reports.order("created_at desc")
           end
           @sale_reports = @sale_reports.page(params[:page]).per(params[:limit])
         end
@@ -67,6 +67,8 @@ module EducodeSales
 
     def show
       @sale_report = OperationReport.find(params[:id])
+      @name = @sale_report.staff.user.real_name
+      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
       render layout: false
     end
 
@@ -78,6 +80,8 @@ module EducodeSales
 
     def edit
       @sale_report = OperationReport.find(params[:id])
+      @name = @sale_report.staff.user.real_name
+      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
       render layout: false
     end
 
@@ -113,6 +117,8 @@ module EducodeSales
 
     def audit
       @sale_report = OperationReport.find(params[:id])
+      @name = @sale_report.staff.user.real_name
+      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
       render layout: false
     end
 
@@ -126,6 +132,6 @@ module EducodeSales
       params.permit(:level1_opinion, :level2_opinion, :level3_opinion, :level1_score, :level2_score, :level3_score)
     end
 
-    
+
   end
 end

data/app/controllers/educode_sales/operations_controller.rb

@@ -4,7 +4,7 @@ module EducodeSales
   class OperationsController < ApplicationController
 
     def trends
-      @years = (1..(Time.now.year - 2020)).map { |d| 2020 + d }
+      @years = (1..(Time.now.year - 2014)).map { |d| 2014 + d }
       @year = params[:year] ? params[:year] : Time.now.year
       @operation_trend = OperationTrend.find_or_create_by(year: @year)
       @inc_users_count = User.where("created_on > ? AND created_on <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").count

data/app/controllers/educode_sales/plans_controller.rb

@@ -22,7 +22,7 @@ module EducodeSales
               @sale_plans = SalePlan.where(staff_id: @current_admin.id)
             when '区域'
               staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
-              @sale_plans = SalePlan.where("staff_id in (?)", staff_ids)
+              @sale_plans = SalePlan.where("staff_id in (?) OR educode_sales_sale_plans.staff_id = ?", staff_ids, @current_admin.id)
             else
               @sale_plans = SalePlan
             end
@@ -44,7 +44,7 @@ module EducodeSales
           if params[:sort].present? && params[:sort][:field]
             @sale_plans = @sale_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
-            @sale_plans = @sale_plans.order("updated_at desc")
+            @sale_plans = @sale_plans.order("created_at desc")
           end
 
           @sale_plans = @sale_plans.page(params[:page]).per(params[:limit])
@@ -78,11 +78,16 @@ module EducodeSales
       else
         @weeks = [week]
       end
-      @businesses = @current_admin.businesses.pluck(:name, :id)
+      ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+      ids1 = FollowUp.where(id: ids).pluck(:business_id)
+      @businesses =Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id)
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
       render layout: false
     end
 
     def new_weekly
+      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      @name = @current_admin.user.real_name
       sale_plans = SalePlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", weekly: Time.now.strftime('%W').to_i, staff_id: @current_admin.id)
       @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
       @departments_count = sale_plans.joins(:business).count("distinct(department_id)")
@@ -92,11 +97,16 @@ module EducodeSales
 
     def new_month
       @business = Business.find_by(id: params[:business_id])
-      @businesses = @current_admin.businesses.pluck(:name, :id)
+      ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+      ids1 = FollowUp.where(id: ids).pluck(:business_id)
+      @businesses =Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id)
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
       render layout: false
     end
 
     def new_monthly
+      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      @name = @current_admin.user.real_name
       sale_plans = SalePlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", staff_id: @current_admin.id, weekly: nil)
       @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
       @departments_count = sale_plans.joins(:business).count("distinct(department_id)")
@@ -123,7 +133,8 @@ module EducodeSales
     end
 
     def edit_week
-      @businesses = @current_admin.businesses.pluck(:name, :id)
+      @businesses = @current_admin.businesses
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
       @sale_plan = SalePlan.find(params[:id])
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
@@ -169,7 +180,8 @@ module EducodeSales
     end
 
     def edit_month
-      @businesses = @current_admin.businesses.pluck(:name, :id)
+      @businesses = @current_admin.businesses
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
       @sale_plan = SalePlan.find(params[:id])
       @finish_rates = []
       11.times { |d| @finish_rates << ["#{d*10}%", d * 10]}

data/app/controllers/educode_sales/sale_reports_controller.rb

@@ -9,7 +9,7 @@ module EducodeSales
       else
         sale_report = @current_admin.sale_reports.build(month: Date.today.beginning_of_month, weekly: Time.now.strftime('%W').to_i)
       end
-      
+
       sale_report.finish_rate = params[:finish_rate]
       sale_report.client = params[:client]
       sale_report.content = params[:content]
@@ -23,6 +23,8 @@ module EducodeSales
 
     def show
       @sale_report = SaleReport.find(params[:id])
+      @name = @sale_report.staff.user.real_name
+      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
       render layout: false
     end
 
@@ -51,7 +53,7 @@ module EducodeSales
               @sale_reports = SaleReport.where(staff_id: @current_admin.id)
             when '区域'
               staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
-              @sale_reports = SaleReport.where("staff_id in (?)", staff_ids)
+              @sale_reports = SaleReport.where("staff_id in (?) OR educode_sales_sale_reports.staff_id = ?", staff_ids, @current_admin.id)
             else
               @sale_reports = SaleReport
             end
@@ -73,7 +75,7 @@ module EducodeSales
           if params[:sort].present? && params[:sort][:field]
             @sale_reports = @sale_reports.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
-            @sale_reports = @sale_reports.order("updated_at desc")
+            @sale_reports = @sale_reports.order("created_at desc")
           end
           @sale_reports = @sale_reports.page(params[:page]).per(params[:limit])
         end
@@ -83,6 +85,8 @@ module EducodeSales
 
     def edit
       @sale_report = SaleReport.find(params[:id])
+      @name = @sale_report.staff.user.real_name
+      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
       render layout: false
     end
 
@@ -118,6 +122,8 @@ module EducodeSales
 
     def audit
       @sale_report = SaleReport.find(params[:id])
+      @name = @sale_report.staff.user.real_name
+      @area = @sale_report.staff.areas.present? ? @sale_report.staff.areas.pluck(:name).join("、") : ''
       render layout: false
     end
 

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -7,17 +7,18 @@ module EducodeSales
     def trends
       # authorize! :trends,  EducodeSales::SaleTrend
       @year = params[:year] ? params[:year] : Time.now.year
-      @years = (1..(Time.now.year - 2020)).map { |d| 2020 + d }
+      @years = (1..(Time.now.year - 2014)).map { |d| 2014 + d }
       year_time = "#{@year}-01-01 00:00:00"
+      year_over_time = "#{@year}-12-31 23:59:59"
       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).where("educode_sales_follow_ups.created_at >= ?", year_time).sum(:total_amount).round(2)
+      @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).sum(:total_amount).round(2)
       stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-      @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, stage_ids).sum(:total_amount).round(2)
+      @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.created_at <= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, year_over_time, stage_ids).sum(:total_amount).round(2)
       s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-      @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, s_stage_ids).sum(:total_amount).round(2)
-      @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_money_plans.date_at >= ?", year_time).sum(:amount).round(2)
+      @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.created_at <= ?  AND educode_sales_follow_ups.stage_id IN (?)", year_time, year_over_time, s_stage_ids).sum(:total_amount).round(2)
+      @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_follow_ups.created_at <= ? ", year_time, year_over_time).sum(:amount).round(2)
       a = Common.where(clazz: '商机类型', name: 'A类').pluck(:id)
       @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).sum(:total_amount).round(2)
       b = Common.where(clazz: '商机类型', name: 'B类').pluck(:id)

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -34,7 +34,7 @@ module EducodeSales
     def update
       follow_up = TeacherFollow.find(params[:id])
       follow_up.assign_attributes(follow_up_params)
-      # follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_rate.to_i) * 0.01 if follow_up.actual_amount
+      # follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_amount.to_i) * 0.01 if follow_up.actual_amount
       if follow_up.save
         render_success
       else

data/app/models/educode_sales/teacher.rb

@@ -13,29 +13,22 @@ module EducodeSales
     belongs_to :follow_up, class_name: 'TeacherFollow', optional: true
     validates :user_id, uniqueness: { allow_blank: true, message: '已存在老师列表'}
 
+    def cal_courses_count
+      if self.user_id.present?
+        Course.joins(:course_members).where(course_members: {user_id: self.user_id}).where("is_delete = 0 and role != 4  and excellent = 0 and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct(:course_id).count
+      else
+        0
+      end
+    end
 
-    # def teacher_used_of_department
-    #   if user_id.present?
-    #     user_ids = User.joins(:user_extension).where(user_extensions: {department_id: self.department_id, identity: 0}).pluck(:id)
-    #     course_ids = CourseMember.where(role: "CREATOR", user_id: user_ids).pluck(:course_id)
-    #     if course_ids.present?
-    #       course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
-    #       course_members.present? ? course_members[0]['count'] : 0
-    #     else
-    #       0
-    #     end
-    #   else
-    #     0
-    #   end
-    # end
     def teacher_used_of_department
-        user_ids = User.joins(:user_extension).where(user_extensions: {department_id: self.department_id, identity: 0}).pluck(:id)
-        course_ids = CourseMember.where(role: "CREATOR", user_id: user_ids).pluck(:course_id)
-        course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
-        course_members.present? ? course_members[0]['count'] : 0
+      user_ids = User.joins(:user_extension).where(user_extensions: {department_id: self.department_id, identity: 0}).pluck(:id)
+      course_ids = CourseMember.where(role: "CREATOR", user_id: user_ids).pluck(:course_id)
+      course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
+      course_members.present? ? course_members[0]['count'] : 0
     end
 
-    def students_count
+    def cal_students_count
       if user_id.present?
         course_ids = Course.joins(:course_members).where(course_members: {user_id: user_id}).where("is_delete = 0 and role != 4  and excellent = 0  and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct("course_id").pluck(:course_id)
         CourseMember.where(course_id: course_ids, role: "STUDENT").count

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

@@ -39,12 +39,14 @@
             elem: '#activities_table',
             url: '/missions/activities',
             toolbar: '#activity_toolbar',
+            totalRow:true,
             defaultToolbar: [],
             cols: [
               [
                 {
                   field: 'id',
                   title:'序号',type: 'numbers',
+                    totalRowText:'合计',
                   width: 60
                 },
                 {
@@ -68,11 +70,13 @@
                   field: 'teachers_count',
                   title: '教师数',
                   width: 100,
+                    totalRow:true,
                   templet: '#teachers_count'
                 },
                 {
                   field: 'students_count',
                   title: '学生数',
+                    totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                   width: 100
                 },
                 {

data/app/views/educode_sales/activities/index.json.jbuilder

@@ -1,14 +1,20 @@
+teachers_count = 0
 json.data do
   json.array! @activities do |d|
     json.id d.id
     json.name d.name
     json.days d.days
     json.teachers_count d.activity_teachers_count
+    teachers_count += d.activity_teachers_count
     json.return_rate d.return_rate
     json.students_count d.students_count || 0
     json.course_rate d.course_rate
     json.start_at d.start_at ? d.start_at.to_s(:date) : ''
   end
 end
+
+json.totalRow do
+  json.teachers_count teachers_count.to_s
+end
 json.code 0
 json.count @activities.total_count

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

@@ -1,3 +1,4 @@
+<div class="min-height-table">
 <script type="text/html" id="teacher_toolbar">
   <div class="layui-btn-container">
     <span class="table-label">教师列表</span>
@@ -5,7 +6,6 @@
     </button>
   </div>
 </script>
-<div class="layuimini-main edit-table">
 <table class="layui-hide" id="show_teachers_table" style="min-height: 300px;" lay-filter="teachers_table"></table>
 </div>
 <script type="text/html" id="show_teachersTableBar">
@@ -53,84 +53,84 @@
             elem: '#show_teachers_table',
             url: '/missions/teachers?activity_id=' + parent.activity_id,
             toolbar: '#teacher_toolbar',
-            defaultToolbar: [],
+            defaultToolbar: ['filter'],
             cols: [
                 [
                  {
                     field: 'id',
-                    width: 120,
+                    width: 60,
                     title:'序号',type: 'numbers',
                 },
                 {
                     field: 'name',
-                    width: 120,
+                    width: 90,
                     title: '姓名',
                     templet: "#name"
                 },
                 {
                     field: 'school',
-                    width: 190,
+                    width: 120,
                     title: '单位',
                 },
                 {
                     field: 'department',
-                    width: 190,
+                    width: 120,
                     title: '部门'
                 },
                 {
                     field: 'professional_title',
                     title: '职称',
-                    width: 120,
+                    width: 80,
                     templet: '#show_follow'
                 },
                 {
                     field: 'job',
-                    width: 120,
+                    width: 80,
                     title: '职务',
                     templet: '#show_keys'
 
                 },
                 {
                   field: 'source',
-                  width: 120,
+                  width: 100,
                   title: '来源',
                 },
                 {
                     field: 'attitude',
-                    width: 120,
+                    width: 80,
                     title: '态度',
                 },
                 {
                     field: 'course_subjects_count',
-                    width: 120,
+                    width: 90,
                     title: '课程方向',
                     templet: "#courses"
                 },
                 {
                     field: 'teacher_follows_count',
-                    width: 120,
+                    width: 90,
                     title: '跟进情况',
                     templet: "#follow"
                 },
                 {
                     field: 'teacher_used',
-                    width: 120,
+                    width: 110,
                     title: '学院渗透率',
                 },
                 {
                     field: 'students',
-                    width: 120,
+                    width: 60,
                     title: '学生',
                 },
                 {
                     field: 'courses_count',
-                    width: 120,
+                    width: 60,
                     title: '课堂',
                     templet: "#class"
                 },
                 {
                     field: 'activities_count',
-                    width: 120,
+                    width: 100,
                     title: '参与活动',
                     templet: "#event"
                 },

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

@@ -71,7 +71,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成</label>
       <div class="layui-input-inline">
-        <input name="divide_rate" class="layui-input" value="<%= @follow_up.divide_rate%>">
+        <input name="divide_amount" class="layui-input" value="<%= @follow_up.divide_amount%>">
       </div>
     </div>
     <div class="layui-form-item">