educode_sales 0.4.8 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09889c1d05306828a3d6dba9b149cdd6600ada4a043c545bfb6914521fdbfe43'
-  data.tar.gz: 9ee3dfb7975c1270ea5adfd43b3cc0bee417a0cb7c544628486465037afd4166
+  metadata.gz: 1ae794ee6831f1fab6465eb9290de9f3155b4a32e13acafe865500e42decaff6
+  data.tar.gz: cb2e8ea7a97b6cd04942343417a7d427f18657dec46ddc2805d11a876a8672f1
 SHA512:
-  metadata.gz: 6acf74a3a544e7cc6fc44809976f549fe4f0ca55cc9e96e91044daf2a0b0acddf4807deda3967cb00310c8403fab92930f5f01fb7d17125ca904746a93b30e3d
-  data.tar.gz: 480ec2fc713a76af3cf6207805ee11c805cdeeaa50daefae6b148c70b976140b0ab01ba29aa4bc263b8b6fe9a6ef077c5dae8035acbbc219c5a32c2449cee336
+  metadata.gz: 72e214c3bca3382997cc389f36eb92747a96323ef141f255154aff068b20c9e5488fe24de4a028bbcb67a6d4c8d457713d078c6c5a70d8be08c311e3402363f4
+  data.tar.gz: f570a34ca2014691e28f95c758a204a82f3953118deccc89b22650476fc32ca7f5cf7a003758023796f2deccb980fbb609cfd0f99a141cafd027c06f8293ef18

data/app/controllers/educode_sales/businesses_controller.rb

@@ -3,6 +3,30 @@ require_dependency "educode_sales/application_controller"
 module EducodeSales
   class BusinessesController < ApplicationController
 
+    def file
+      gon.folder = edu_setting('attachment_folder') + '/'
+      render layout: false
+    end
+    def upload_file
+      render layout: false
+    end
+    def time_line
+      @business = Business.find(params[:business_id])
+      respond_to do |format|
+        format.html do
+          @follow_ups = @business.follow_ups.order(created_at: :desc)
+          # @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.page(params[:page]).per(params[:limit])
+          render layout: false
+        end
+      end
+    end
+
     def index
       authorize! :read, Business
       respond_to do |format|
@@ -15,6 +39,8 @@ module EducodeSales
             gon.menus << { title: '添加周计划', event: 'week' }
             gon.menus << { title: '添加月计划', event: 'month' }
           end
+          gon.menus << { title: '跟进时间线', event: 'time_line' }
+          gon.menus << { title: '附件管理', event: 'file' }
           if can?(:update, EducodeSales::Business)
             gon.menus << { title: '编辑', event: 'edit' }
           end
@@ -40,6 +66,45 @@ module EducodeSales
             end
           end
 
+          if params[:q].present? && params[:q][:name].present?
+            @year = params[:q][:name].split("-")[1].present? ? params[:q][:name].split("-")[1] : ''
+          end
+
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-现有商机)"
+            a_id = Common.find_by(extras: EducodeSales::Common::ATYPE)&.id
+            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]
+            @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)
+          end
+
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已中标商机)"
+            stage_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.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)
+          end
+
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已签单商机)"
+            s_stage_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.signed_date > ? AND educode_sales_follow_ups.signed_date < ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids)
+          end
+
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已回款商机)"
+            x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+            # @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ? AND educode_sales_businesses.return_money > 0", "#{@year}-01-01", "#{@year}-12-31").joins("
+            #   JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            # ").where.not("educode_sales_follow_ups.clazz_id = ?",x_id)
+            year_time = "#{@year}-01-01 00:00:00"
+            year_over_time = "#{@year}-12-31 23:59:59"
+            @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 <= ? ", year_time, year_over_time).distinct
+          end
+
           if params[:q].present? && params[:q][:all].present?
             @businesses = @businesses
           end
@@ -51,7 +116,7 @@ module EducodeSales
           end
 
           @businesses = @businesses
-          if params[:q].present? && params[:q][:name].present?
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] != "(销售态势-" + @year + "-已中标商机)" && params[:q][:name] != "(销售态势-" + @year + "-已签单商机)" && params[:q][:name] != "(销售态势-" + @year + "-已回款商机)" && params[:q][:name] != "(销售态势-现有商机)"
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
           end
           if params[:q].present? && params[:q][:department].present?
@@ -59,10 +124,10 @@ module EducodeSales
             @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 staff_id = ?",params[:q][:staff_id]).ids
+            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]).pluck(:business_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
@@ -109,6 +174,8 @@ module EducodeSales
             educode_sales_businesses.*,
             last_follow.invitation_at,
             last_follow.reception_at,
+            last_follow.bidded_date,
+            last_follow.signed_date,
             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])
@@ -158,7 +225,7 @@ module EducodeSales
 
     def destroy
       business = Business.find(params[:id])
-      business.destroy
+      business.soft_destroy(@current_admin.id)
       render_success
     rescue ActiveRecord::DeleteRestrictionError => e
       render_failure '该商机已其它关联数据产生，暂不能删除'
@@ -213,7 +280,16 @@ module EducodeSales
     end
 
     def show_follow_record
-      @follow_up = FollowUp.find(params[:follow_up_id])
+      follow_up_id = params[:follow_up_id]
+      @follow_up = FollowUp.find(follow_up_id)
+      id = @follow_up.id
+      @follow_ups = Business.find(@follow_up.business_id).follow_ups
+      ids = @follow_ups.ids
+      size = ids.size
+      ids = ids.reverse
+      index = ids.index(id)
+      @next_id = (index != size - 1 && size > 1) ? ids[index + 1] : 0
+      @pre_id = (index != 0 && size > 1) ? ids[index - 1] : 0
       render layout: false
     end
 
@@ -243,5 +319,8 @@ module EducodeSales
       params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id)
     end
 
+    def edu_setting name
+      EduSetting.get(name)
+    end
   end
 end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -36,7 +36,7 @@ module EducodeSales
     def destroy
       follow_up = FollowUp.find(params[:id])
       business = follow_up.business
-      if follow_up.destroy
+      if follow_up.soft_destroy(@current_admin.id)
         if follow_up.id == business.last_follow_up_id
           business.update(last_follow_up: business.follow_ups.last, return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: business.follow_ups.last&.id).sum(:amount))
         end
@@ -132,7 +132,8 @@ module EducodeSales
         )
         teacher.save
         key_peprson = KeyPerson.new(teacher_params)
-        key_peprson.teacher = teacher
+        teacher_id = EducodeSales::Teacher.find_by(name: user.real_name, department_id: user.department_id).id
+        key_peprson.teacher_id = teacher_id
       end
 
       follow_up.key_person << key_peprson
@@ -156,7 +157,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id, :bidded_date, :signed_date)
     end
 
     def teacher_params

data/app/controllers/educode_sales/home_controller.rb

@@ -34,7 +34,7 @@ module EducodeSales
     end
 
     def search_operation_teacher
-      @data = Teacher.where("name like ? and is_key = false", "%#{params[:q]}%").limit(20)
+      @data = @current_admin.teachers.where("name like ? and is_key = false", "%#{params[:q]}%").limit(20)
     end
 
     def search_edu_teacher

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -52,13 +52,14 @@ module EducodeSales
     end
     def new_week
       @teacher = Teacher.find_by(id: params[:teacher_id])
+      @week = Time.now.strftime('%W').to_i
       week = Time.now.strftime('%W').to_i
       if week > 3
-        @weeks = [week, week - 1, week - 2]
+        @weeks = [[week+2,week+2], [week+1,week+1], [week.to_s + '  本周',week], [week - 1,week - 1], [week - 2,week - 2]]
       elsif week == 2
-        @weeks = [week, week - 1]
+        @weeks = [[week.to_s + '  本周',week], [week - 1,week - 1]]
       else
-        @weeks = [week]
+        @weeks = [[week.to_s + '  本周',week]]
       end
       @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
       render layout: false
@@ -77,7 +78,17 @@ module EducodeSales
     end
 
     def new_weekly
-      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      d = @current_admin
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       @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
@@ -94,7 +105,17 @@ module EducodeSales
     end
 
     def new_monthly
-      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      d = @current_admin
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       @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
@@ -135,7 +156,7 @@ module EducodeSales
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
         if week > 3
-          @weeks = [week, week - 1, week - 2]
+          @weeks = [week+2, week+1, week, week - 1, week - 2]
         elsif week == 2
           @weeks = [week, week - 1]
         else
@@ -143,6 +164,13 @@ module EducodeSales
         end
         @weeks << @sale_plan.weekly
         @weeks = @weeks.uniq.sort
+        @weeks = @weeks.map do |d|
+          if d == week
+            ["#{d}  本周", d]
+          else
+            [d, d]
+          end
+        end
       end
       @months = [Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]
       @months << @sale_plan.month.strftime("%Y-%m")

data/app/controllers/educode_sales/operation_reports_controller.rb

@@ -68,7 +68,17 @@ 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("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 
@@ -81,7 +91,17 @@ 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("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 
@@ -118,7 +138,17 @@ 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("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     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 - 2014)).map { |d| 2014 + d }
+      @years = (1..(Time.now.year - 2014)).reverse_each.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

@@ -70,22 +70,33 @@ module EducodeSales
 
     def new_week
       @business = Business.find_by(id: params[:business_id])
+      @week = Time.now.strftime('%W').to_i
       week = Time.now.strftime('%W').to_i
       if week > 3
-        @weeks = [week, week - 1, week - 2]
+        @weeks = [[week+2,week+2], [week+1,week+1], [week.to_s + '  本周',week], [week - 1,week - 1], [week - 2,week - 2]]
       elsif week == 2
-        @weeks = [week, week - 1]
+        @weeks = [[week.to_s + '  本周',week], [week - 1,week - 1]]
       else
-        @weeks = [week]
+        @weeks = [[week.to_s + '  本周',week]]
       end
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
-      @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @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] }
+      @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
       render layout: false
     end
 
     def new_weekly
-      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      d = @current_admin
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       @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
@@ -97,13 +108,23 @@ module EducodeSales
     def new_month
       @business = Business.find_by(id: params[:business_id])
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
-      @businesses =Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @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] }
+      @businesses =Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
       render layout: false
     end
 
     def new_monthly
-      @area =@current_admin.areas.present? ? @current_admin.areas.pluck(:name).join("、") : ''
+      d = @current_admin
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       @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
@@ -132,13 +153,13 @@ module EducodeSales
 
     def edit_week
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
-      @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @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] }
+      @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
       @sale_plan = SalePlan.find(params[:id])
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
         if week > 3
-          @weeks = [week, week - 1, week - 2]
+          @weeks = [week+2, week+1, week, week - 1, week - 2]
         elsif week == 2
           @weeks = [week, week - 1]
         else
@@ -146,6 +167,13 @@ module EducodeSales
         end
         @weeks << @sale_plan.weekly
         @weeks = @weeks.uniq.sort
+        @weeks = @weeks.map do |d|
+          if d == week
+            ["#{d}  本周", d]
+          else
+            [d, d]
+          end
+        end
       end
       @months = [Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]
       @months << @sale_plan.month.strftime("%Y-%m")
@@ -167,7 +195,7 @@ module EducodeSales
 
     def destroy
       sale_plan = SalePlan.find(params[:id])
-      if sale_plan.destroy
+      if sale_plan.soft_destroy(@current_admin.id)
         render_success
       else
         render_failure sale_plan
@@ -180,8 +208,8 @@ module EducodeSales
 
     def edit_month
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
-      @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @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] }
+      @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.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/recycles_controller.rb

@@ -0,0 +1,95 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class RecyclesController < ApplicationController
+
+    def destroy
+      @recycle = Recycle.find(params[:id])
+      @recycle.destroy
+      render_success
+    end
+
+
+
+    def restore_reports
+      @recycle = Recycle.find(params[:id])
+      report_id = @recycle.source_id
+      EducodeSales::SaleReport.unscoped.find(report_id).update(deleted_at: nil)
+      @recycle.destroy
+      render_success
+    end
+
+    def restore_plans
+      @recycle = Recycle.find(params[:id])
+      plan = EducodeSales::SalePlan.unscoped.find(@recycle.source_id)
+      business = EducodeSales::Business.unscoped.find(plan.business_id)
+      Recycle.find_by(source_id: business.id).destroy if Recycle.find_by(source_id: business.id).present?
+      business.update(deleted_at: nil)
+      follow_ups = EducodeSales::FollowUp.unscoped.where(business_id: business.id)
+      follow_ups.update_all(deleted_at: nil)
+      plan.update(deleted_at: nil)
+      @recycle.destroy
+      render_success
+    end
+
+    def restore_businesses
+      @recycle = Recycle.find(params[:id])
+      business_id = @recycle.source_id
+      EducodeSales::Business.unscoped.find(business_id).update(deleted_at: nil)
+      follow_ups = EducodeSales::FollowUp.unscoped.where(business_id: business_id)
+      follow_ups.update_all(deleted_at: nil)
+      @recycle.destroy
+      render_success
+    end
+
+    def business
+      @businesses = Recycle.where(source_type:"EducodeSales::Business")
+      if params[:sort].present? && params[:sort][:field]
+        @businesses = @businesses.order("created_at #{params[:sort][:order]}")
+      else
+        @businesses = @businesses.order("educode_sales_recycles.created_at desc")
+      end
+      @businesses = @businesses.page(params[:page]).per(params[:limit])
+    end
+
+    def weekly
+      @weekly = Recycle.where(source_type:"EducodeSales::SaleReport").order(created_at: :desc).page(params[:page]).per(params[:limit])
+      if params[:sort].present? && params[:sort][:field]
+        @weekly = @weekly.order("created_at #{params[:sort][:order]}")
+      else
+        @weekly = @weekly.order("educode_sales_recycles.created_at desc")
+      end
+      @weekly = @weekly.page(params[:page]).per(params[:limit])
+    end
+
+    def monthly
+      @monthly = Recycle.where(source_type:"EducodeSales::SaleReport")
+      if params[:sort].present? && params[:sort][:field]
+        @monthly = @monthly.order("created_at #{params[:sort][:order]}")
+      else
+        @monthly = @monthly.order("educode_sales_recycles.created_at desc")
+      end
+      @monthly = @monthly.page(params[:page]).per(params[:limit])
+    end
+
+    def weekPlan
+      @weekPlans = Recycle.where(source_type:"EducodeSales::SalePlan")
+      if params[:sort].present? && params[:sort][:field]
+        @weekPlans = @weekPlans.order("created_at #{params[:sort][:order]}")
+      else
+        @weekPlans = @weekPlans.order("educode_sales_recycles.created_at desc")
+      end
+      @weekPlans = @weekPlans.page(params[:page]).per(params[:limit])
+    end
+
+    def monthPlan
+      @monthPlans = Recycle.where(source_type:"EducodeSales::SalePlan")
+      if params[:sort].present? && params[:sort][:field]
+        @monthPlans = @monthPlans.order("created_at #{params[:sort][:order]}")
+      else
+        @monthPlans = @monthPlans.order("educode_sales_recycles.created_at desc")
+      end
+      @monthPlans = @monthPlans.page(params[:page]).per(params[:limit])
+    end
+end
+end

data/app/controllers/educode_sales/roles_controller.rb

@@ -35,6 +35,11 @@ module EducodeSales
       render layout: false
     end
 
+    def rename
+      @name = Role.find(params[:id]).name
+      render layout: false
+    end
+
     def update_role
       role = Role.find(params[:id])
       if role.update(name: params[:name])

data/app/controllers/educode_sales/sale_reports_controller.rb

@@ -24,13 +24,23 @@ 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("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 
     def destroy
       sale_report = SaleReport.find(params[:id])
-      if sale_report.destroy
+      if sale_report.soft_destroy(@current_admin.id)
         render_success
       else
         render_failure sale_report
@@ -86,7 +96,17 @@ 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("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end
 
@@ -123,7 +143,17 @@ 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("、") : ''
+      d = @sale_report.staff
+      area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
+      if d.areas.present?
+        if d.areas.ids.sort.to_s == area_ids
+          @area = '全国'
+        else
+          @area =  d.areas.pluck(:name).join("、")
+        end
+      else
+        @area =  ''
+      end
       render layout: false
     end