educode_sales 0.4.5 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 685592848049f4a9fbcb75c52c46eb4a1ad1ee9cf14725b44a7c79ad0e0714d1
-  data.tar.gz: 8b3ac5946bdb350f6bb92b79f7ab9a5ba91678e24c24ae70b06766709f84fb3d
+  metadata.gz: e75cbf87f4530e2665dd16d6fa56d82a14a0479ba0ce6f9f2cb39f5282ddb034
+  data.tar.gz: b4ab6a572903f23688eeb0441f66776f43ca4cabc70467cb013fff2f1c922473
 SHA512:
-  metadata.gz: 14cdf1d7faa137de66574701ff7e13e76820bfed31e92960118a1407358c69134c07e51f251532e38de575064d667ab9f2c54d9299a6f59f51a150ffd1b73d83
-  data.tar.gz: 15b1c39abb61f478992198b04698af35cc90e1a6077b697c83d107e1d47c448fbc571436681b630e147aee10fbcb73607e0f7aae5567359e2ceeab4188959f98
+  metadata.gz: 05cac4d3624e3c08a12957400aef7a091ef51b7edd288e767a6f31f8f8bdfdab6af587335abac527005ed657d115d8a938ef6a8e62f0c6c33514041857335309
+  data.tar.gz: d23d1bd4ce8bcb827e5423e01351eb5c661b95cb64f4c61076cf974752c360b35587c74263e69f6a6392255d08686edc77a4e5813032534f00663afe8724ca2b

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,36 @@ module EducodeSales
             end
           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] == "(销售态势-已中标商机)"
+            @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 < ?", "#{Time.now.year}-01-01", "#{Time.now.year}-12-31")
+          end
+
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-已签单商机)"
+            @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 < ?", "#{Time.now.year}-01-01", "#{Time.now.year}-12-31")
+          end
+
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-已回款商机)"
+            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", "#{Time.now.year}-01-01", "#{Time.now.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)
+          end
+
           if params[:q].present? && params[:q][:all].present?
             @businesses = @businesses
           end
@@ -51,7 +107,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] != "(销售态势-已中标商机)" && params[:q][:name] != "(销售态势-已签单商机)" && params[:q][:name] != "(销售态势-已回款商机)" && params[:q][:name] != "(销售态势-现有商机)"
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
           end
           if params[:q].present? && params[:q][:department].present?
@@ -213,7 +269,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

@@ -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

@@ -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 = @current_admin.teachers.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
@@ -54,11 +54,11 @@ module EducodeSales
       @teacher = Teacher.find_by(id: params[:teacher_id])
       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,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)")
@@ -131,7 +135,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
@@ -139,6 +143,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

@@ -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)).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

@@ -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])
@@ -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
@@ -72,19 +72,21 @@ module EducodeSales
       @business = Business.find_by(id: params[:business_id])
       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.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id).pluck(:name, :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.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)")
@@ -94,13 +96,15 @@ 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.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id).pluck(:name, :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.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)")
@@ -127,12 +131,14 @@ module EducodeSales
     end
 
     def edit_week
-      @businesses = @current_admin.businesses.pluck(:name, :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.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
@@ -140,6 +146,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")
@@ -173,7 +186,9 @@ module EducodeSales
     end
 
     def edit_month
-      @businesses = @current_admin.businesses.pluck(:name, :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.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,20 +7,21 @@ 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)).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
       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.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.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.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?", year_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/upload_files_controller.rb

@@ -0,0 +1,99 @@
+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]).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/educode_sales/common.rb

@@ -4,6 +4,10 @@ module EducodeSales
 
     XTYPE = "x_class"
     OTYPE = 'o_class'
+    ATYPE = 'a_class'
+    BTYPE = 'b_class'
+    CTYPE = 'c_class'
+    DTYPE = 'd_class'
 
     validates :name, uniqueness: {scope: :clazz, message: '已存在'}
     

data/app/models/educode_sales/sale_plan.rb

@@ -2,6 +2,7 @@ module EducodeSales
   class SalePlan < ApplicationRecord
     belongs_to :business
     belongs_to :staff
+    validates :business_id, presence: true
 
     validates :month, presence: true
   end