educode_sales 0.4.7 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e609ed864a33df3f8398ab53416e7652333965a094df7965414cd93058e0965
-  data.tar.gz: b506ac92b247f3bbdebb03ffa7e5d7e4c5bd48d0ac4e68a01919d81137cf175d
+  metadata.gz: 249bcf8612e073c689b8c6f696cc3590aeffb4271b6eef3ed7b95ecc2033aba5
+  data.tar.gz: 1efd466f3e9630b9908c94d7fe6184979ab775c75946b77987a8f07e67618b64
 SHA512:
-  metadata.gz: 5ef7c7f3635c83459308d71cc80e89a6f1e45b38e0fec1c65d53fe469f4fb4d75a5b1c2982cd04c7cf4fc66299742275b8fe1f655f6f656f525fb40abceac5b0
-  data.tar.gz: 943c29ffb564e3cc318c3bc55ce6daf4dd08e5986039f463abac740d6626d6e6b062300280e0b015cc4ce31114ffe913350e0ec95540cdf70add0ee000ac0bc2
+  metadata.gz: f189282b2df2c5bbae317f6ed513862721dc280885791fe5dfda7b2245894d511d0d303a2d5caaab304adb855de8f9d8e65f2c014f4212b34b347e3126854fd0
+  data.tar.gz: 6848e0f74872c5b7e53e05104a224abd58a6a4b8b374393e918ad09c20a34d83b7aa78789bc9e6c2d1091d5f06f6d057400ed0eeeaa9605637bd0abe592ffdd8

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
+      @root = Rails.root
+      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
 

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
@@ -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_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
@@ -135,7 +136,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 +144,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/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

@@ -59,7 +59,7 @@ module EducodeSales
     def create
       plan = @current_admin.sale_plans.build(plan_params)
       plan.month = params["month"] + "-1"
-      plan.business = @current_admin.businesses.find_by(id: params[:business_id])
+      plan.business = Business.find_by(id: params[:business_id])
       if plan.save
         render_success
       else
@@ -70,18 +70,18 @@ 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
-      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] }
+      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).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
 
@@ -97,10 +97,9 @@ module EducodeSales
 
     def new_month
       @business = Business.find_by(id: params[:business_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] }
+      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).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
 
@@ -133,13 +132,14 @@ module EducodeSales
     end
 
     def edit_week
-      @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] }
+      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).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
@@ -147,6 +147,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")
@@ -168,7 +175,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 +187,9 @@ module EducodeSales
     end
 
     def edit_month
-      @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] }
+      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).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/sale_reports_controller.rb

@@ -30,7 +30,7 @@ module EducodeSales
 
     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

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -7,7 +7,7 @@ module EducodeSales
     def trends
       # authorize! :trends,  EducodeSales::SaleTrend
       @year = params[:year] ? params[:year] : Time.now.year
-      @years = (1..(Time.now.year - 2014)).map { |d| 2014 + d }
+      @years = (1..(Time.now.year - 2014)).reverse_each.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
@@ -15,13 +15,13 @@ module EducodeSales
       @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)
       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.created_at <= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, year_over_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.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)
       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.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)
+      @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).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).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_money_plans.date_at <= ? ", year_time, year_over_time).sum(:amount).round(2)
+      a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).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)
+      b = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name).pluck(:id)
       @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", b).sum(:total_amount).round(2)
     end
 

data/app/controllers/educode_sales/sales_controller.rb

@@ -12,8 +12,8 @@ module EducodeSales
         end
         format.json do
           common = Common.find_by(clazz: 'staff_type', name: '销售')
-          @a_clazz = Common.find_by(clazz: 'business_type', name: 'A类')
-          @b_clazz = Common.find_by(clazz: 'business_type', name: 'B类')
+          @a_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name)
+          @b_clazz = Common.find_by(clazz: 'business_type', name: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name)
           @x = Common.find_by(extras: EducodeSales::Common::XTYPE)
           @step_ids = Common.where(name: %w(已中标 已签单 已验收 回款中 服务中 已结束), clazz: 'business_step').pluck(:id)
           

data/app/controllers/educode_sales/staffs_controller.rb

@@ -8,7 +8,7 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @staffs = Staff.where(is_admin: false).page(params[:page]).per(params[:limit])
+          @staffs = Staff.where(is_admin: false, deleted_at: nil).page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -37,10 +37,10 @@ module EducodeSales
 
     def destroy
       staff = Staff.find(params[:id])
-      staff.destroy
+      staff.update(deleted_at: Time.now, expired_at: Time.now.days_ago(1))
       render_success
-    rescue ActiveRecord::DeleteRestrictionError => e
-      render_failure '该用户已有数据产生，暂不能删除'
+    # rescue ActiveRecord::DeleteRestrictionError => e
+    #   render_failure '该用户已有数据产生，暂不能删除'
     end
 
     def disable

data/app/controllers/educode_sales/upload_files_controller.rb

@@ -0,0 +1,105 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class UploadFilesController < ApplicationController
+
+    def index
+      respond_to do |format|
+        format.html do
+        end
+        format.json do
+          @files = Attachment.where(description: "business", container_id:params[:business_id])
+          if params[:sort].present? && params[:sort][:field]
+            @files = @files.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @files = @files.order("created_on desc")
+          end
+          @files = @files.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def create
+        upload_file = params["file"]
+        raise "未上传文件" unless upload_file
+        save_path = File.join("#{Rails.root}/public/images")
+        ext = file_ext(upload_file.original_filename)
+        local_path, digest = file_save_to_local(save_path, upload_file.tempfile, ext)
+        content_type = upload_file.content_type.presence || 'application/octet-stream'
+        disk_filename = local_path[save_path.size + 1, local_path.size]
+        @attachment = Attachment.where(disk_filename: disk_filename,
+                                       author_id: @current_admin.id).first
+        if @attachment.blank?
+          @attachment = Attachment.new
+          @attachment.filename = upload_file.original_filename
+          @attachment.description = "business"
+          @attachment.disk_filename = local_path[save_path.size + 1, local_path.size]
+          @attachment.filesize = upload_file.tempfile.size
+          @attachment.content_type = content_type
+          @attachment.digest = digest
+          @attachment.author_id = @current_admin.id
+          @attachment.container_id = params[:business_id]
+          @attachment.save!
+        else
+          logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"
+        end
+        render_success
+    end
+
+    def destroy
+      file = Attachment.find(params[:id])
+      file.destroy
+      File.delete("#{Rails.root}/public/images/" + file.disk_filename)
+      render_success
+    end
+
+    def download
+      file = Attachment.find_by_id(params[:id])
+      raise "未找到文件" unless file
+      send_file("#{Rails.root}/public/images/" + file.disk_filename, filename: file.title, stream: true, type: file.content_type.presence || 'application/octet-stream')
+    end
+
+
+    def file_ext(file_name)
+      ext = ''
+      exts = file_name.split(".")
+      if exts.size > 1
+        ext = ".#{exts.last}"
+      end
+      ext
+    end
+
+    def file_save_to_local(save_path, temp_file, ext)
+      unless Dir.exists?(save_path)
+        FileUtils.mkdir_p(save_path) ##不成功这里会抛异常
+      end
+
+      digest = md5_file(temp_file)
+      digest = "#{digest}_#{(Time.now.to_f * 1000).to_i}"
+      local_file_path = File.join(save_path, digest) + ext
+      save_temp_file(temp_file, local_file_path)
+
+      [local_file_path, digest]
+    end
+
+
+    def md5_file(temp_file)
+      md5 = Digest::MD5.new
+      temp_file.rewind
+      while (buffer = temp_file.read(8192))
+        md5.update(buffer)
+      end
+      md5.hexdigest
+    end
+
+    def save_temp_file(temp_file, save_file_path)
+      File.open(save_file_path, 'wb') do |f|
+        temp_file.rewind
+        while (buffer = temp_file.read(8192))
+          f.write(buffer)
+        end
+      end
+    end
+
+  end
+end

data/app/models/concerns/deletable.rb

@@ -0,0 +1,8 @@
+module Deletable
+  extend ActiveSupport::Concern
+
+  def soft_destroy(user_id)
+    self.update(deleted_at: Time.now)
+    EducodeSales::Recycle.create(source: self, deleter_id: user_id)
+  end
+end

data/app/models/educode_sales/application_record.rb

@@ -1,5 +1,7 @@
 module EducodeSales
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true
+
+
   end
 end