educode_sales 0.7.9 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9403e25df2848c96f744c79481e62ea3ebe44c6da7d265bd1e107885c13b108
-  data.tar.gz: 994b9567c3b88d6a804b43484447932725dcfe5d3c0f1e6113233c309a1f1f62
+  metadata.gz: c2693da2ea5d023a9703a21550dceaf68b5795f052201e6ccce8b16d506e0079
+  data.tar.gz: da956ba153a3b5d72841e40d578766b389b1d296ac0d81efbdb279adaba1e131
 SHA512:
-  metadata.gz: 202b2c2d096f7b8d949658605ed1eb1d9b288a2764ee8144e83efb60b7c718720471f3acec0f5a818302798550eef40c53b1642421465bb3370dec1160272fee
-  data.tar.gz: d5cd014d540019070da9da22c4b7439c4a71b242d6841d34494fdff9af0b049e9d14e22200af16b8c5a32f06bdd6ba9c18bb7b1c21a8c8a78c94f7ec446f7d7f
+  metadata.gz: a20abc2ed0a9a0dd161d33e3ae9d41507721a5940c5db87bba4570ad1ec573bd602fdd654398b870140ca8f432b7b3391b8b2ca234d7379de6397026f4761d6b
+  data.tar.gz: 5254ba05ec825566dbcedef4d4d5208c137b1aba10bb7505355cb815ff4c1f926bfa5e54e3f13406def8bdf90a525d032f2cc52f8c7651906c99d1b41244079e

data/app/controllers/educode_sales/application_controller.rb

@@ -27,6 +27,20 @@ module EducodeSales
       end
     end
 
+    def filter
+      params[:check] = params[:check] == "true" ? 0:1
+      begin
+        filter = Filter.find_or_create_by!(staff_id: @current_admin.id, clazz: params[:type])
+        filter.extras["#{params[:name]}"] = params[:check]
+        filter.save!
+        render json: {success: true ,hidden: params[:check]}
+      rescue => e
+        render_failure("操作失败")
+      end
+    end
+
+
+
     rescue_from CanCan::AccessDenied do |exception|
       redirect_to no_permission_path
     end

data/app/controllers/educode_sales/assessments_controller.rb

@@ -15,11 +15,19 @@ module EducodeSales
             gon.export_menus << { title: '导出到Csv文件', event: 'export_csv' }
             gon.export_menus << { title: '导出到Excel文件', event: 'export_excel' }
             # index页面new弹出层下使用
-            gon.demo = Staff.joins(:user).where(job_type: common.id).map do |d|
+            gon.staff_ids = Staff.joins(:user).where(job_type: common.id).map do |d|
               {value: d.id, name: d.user.real_name }
             end
+            filter = Filter.find_or_create_by(staff_id: @current_admin.id, clazz: "assessments_setup")
+            if filter.extras.present?
+              gon.filter = filter.extras
+            else
+              gon.filter = {}
+            end
           end
           format.json do
+            @year2 = params[:q]&[:assessment_year] || '2022'
+            p @year2
             @year = params[:q].present? && params[:q][:assessment_year].present? ? params[:q][:assessment_year]:'2022'
             @assessments_id = params[:q].present? && params[:q][:assessment_id].present? ? params[:q][:assessment_id]: '1'
             @assessments = AssessmentsSetting.where("assessment_year >= ? and assessment_year <= ?", "#{@year}-01-01 00:00:00".to_date, "#{@year}-12-31 23:59:00".to_date)
@@ -34,14 +42,16 @@ module EducodeSales
     # 新增
     def create
       begin
-      demo = AssessmentsSetting.new(params_create)
-      demo.user_id = current_user.user_id
-      demo.assessment_year = "#{params[:assessment_year]}-01-01"
+        assessment = AssessmentsSetting.new(params_create)
+        assessment.user_id = current_user.user_id
+        assessment.assessment_year = "#{params[:assessment_year]}-01-01"
+        AssessmentsSetting.transaction do
         params[:staffs_ids].split(",").each do |d|
-            staff = demo.dup
+            staff = assessment.dup
             staff.staff_id = d.to_i
             staff.save
         end
+      end
         render_success
       rescue  => e
         render_failure '增加数据错误'
@@ -83,8 +93,8 @@ module EducodeSales
         assessment = AssessmentsSetting.find(params[:id])
         assessment.destroy
         render_success
-      rescue ActiveRecord::DeleteRestrictionError => e
-        render_failure '渠道下已有关联数据产生，暂不能删除'
+      rescue  => e
+        render_failure '暂不能删除'
       end
     end
 
@@ -109,14 +119,13 @@ module EducodeSales
       # common = Common.find_by(clazz: 'staff_type', name: '销售')
       # @staff_ids = Staff.joins(:user).where(job_type: common.id).pluck(:id)
       @assessment_id = params[:q].present? && params[:q][:assessment_id].present? ? params[:q][:assessment_id]:'1'
-      @assessment_year = params[:q].present? && params[:q][:assessment_year].present? ?  params[:q][:assessment_year] : '2022'
+      @assessment_year = params[:q].present? && params[:q][:assessment_year].present? ?  params[:q][:assessment_year] : Time.now.year
       @assessments =AssessmentsSetting.where(assessment: @assessment_id)
                                       .where("assessment_year >= ? and assessment_year <= ?", "#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:00".to_date)
                                       .order("created_at desc")
       if @assessments.present?
         # 小优化
-        @staff_ids = params[:q].present? && params[:q][:staff_id].present? ? [params[:q][:staff_id].to_i]:@assessments.pluck(:staff_id).uniq
-        p @staff_ids
+        @staff_ids = params[:q].present? && params[:q][:staff_id].present? ? [params[:q][:staff_id].to_i]:@assessments.distinct.pluck(:staff_id)
         progress_main
         #  注意一下
         @assessments = @assessments.where(staff_id: @staff_ids)
@@ -158,14 +167,13 @@ module EducodeSales
       @staff_ids.each do |d|
         # 注意
         businesses = @businesses.where(staff_id: d)
-        b = []
-        a=[]
-        FollowUp.joins("JOIN educode_sales_businesses ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id").where("educode_sales_businesses.id in (?)",businesses.pluck(:id)).each do |m|
-          b << {value: m.actual_amount.to_i, date:m.signed_date.to_s[5..6].to_i}
+        data_count=[]
+        data_list = FollowUp.joins("JOIN educode_sales_businesses ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id")
+                .where("educode_sales_businesses.id in (?)",businesses.pluck(:id)).map do |m|
+          {value: m.actual_amount.to_i, date:m.signed_date.to_s[5..6].to_i}
         end
-
-        count_data(b,a)  #  统计数据
-        update_assessments_progress(a,d) #  批量更新assessment数据  事物  出现一个commit
+        count_data(data_list,data_count)  #  统计数据
+        update_assessments_progress(data_count,d) #  批量更新assessment数据  事物  一个commit
       end
     end
 
@@ -186,20 +194,19 @@ module EducodeSales
           b_ids = Business.where(school_id: school_ids).pluck(:last_follow_up_id)
           ids = a_ids + b_ids
           @money_plans = MoneyPlan.joins(:follow_up).where(follow_up_id: ids)
-        else
+          else
           @money_plans = MoneyPlan.joins(:follow_up).where(follow_up_id: follow_up_ids)
         end
       end
-      #  todo 1 :实际回款 0:计划回款 where(clazz: 1 OR 实际回款 )  先把staff写死
+      #  todo 1 :实际回款 0:计划回款 where(clazz: 1 OR 实际回款 )
       @money_plans = @money_plans.where(clazz: 1).where.not(date_at: nil)
       @staff_ids.each do |d|
-        b = []
-        a = []
-        @money_plans.where(staff_id: d).each do |m|
-          b << {date:m.date_at.to_s[5..6].to_i, value:m.amount.to_i}
+        data_count = []
+        data_list = @money_plans.where(staff_id: d).map do |m|
+          {date:m.date_at.to_s[5..6].to_i, value:m.amount.to_i}
         end
-        count_data(b,a)
-        update_assessments_progress(a, d)
+        count_data(data_list,data_count)
+        update_assessments_progress(data_count, d)
       end
     end
 
@@ -235,20 +242,20 @@ module EducodeSales
     def customer_and_busniness_visits
       @staff_ids.each do |m|
         customers = @customers.where(id: EducodeSales::CustomerExtension.where(customer_staff_id: m).pluck(:school_id))
-        b = []
-        a = []
+        data_list = []
+        data_count = []
         CustomerFollow.joins(:school).where(school_id: customers.pluck(:id))
                               .where("Educode_Sales_customer_follows.created_at >= ? and Educode_Sales_customer_follows.created_at <= ?","#{@assessment_year}-01-01 ","#{@assessment_year}-12-31 23:59:59" )
                               .each do |d|
-          b << {value: 1, date: d.created_at.to_s[5..6].to_i}
+          data_list << {value: 1, date: d.created_at.to_s[5..6].to_i}
         end
         FollowUp.joins(:business).where("Educode_Sales_businesses.id in (?)",EducodeSales::Business.where(school_id: customers.pluck(:id)).pluck(:id))
                 .where("Educode_Sales_follow_ups.created_at >= ? and Educode_Sales_follow_ups.created_at <= ?","#{@assessment_year}-01-01 00:00:00", "#{@assessment_year}-12-31 23:59:59").each do |d|
-          b << {date: d.created_at.to_s[5..6].to_i, value: 1}
+          data_list << {date: d.created_at.to_s[5..6].to_i, value: 1}
         end
-        count_data(b,a)
+        count_data(data_list,data_count)
         assessment = @assessments.where(staff_id: m)
-        update_assessments_progress(a, assessment)
+        update_assessments_progress(data_count, assessment)
       end
     end
 
@@ -262,13 +269,12 @@ module EducodeSales
       @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)
       @staff_ids.each do |d|
         businesses = @businesses.where(staff_id: d)
-        b = []
-        a = []
-        businesses.each do |m|
-          b << {date: m.created_at.to_s[5..6].to_i, value: 1}
+        data_count = []
+        data_list = businesses.map do |m|
+          {date: m.created_at.to_s[5..6].to_i, value: 1}
         end
-        count_data(b,a)
-        update_assessments_progress(a, d)
+        count_data(data_list,data_count)  #  统计数据
+        update_assessments_progress(data_count, d)  #  批量更新assessment数据  事物  一个commit
       end
     end
 
@@ -297,30 +303,27 @@ module EducodeSales
 
 
     # 更新assessments_settings表中数据
-    def update_assessments_progress(a,staff_id)
-        a[12] = a[0].to_i + a[1].to_i + a[2].to_i
-        a[13] = a[3].to_i + a[4].to_i + a[5].to_i
-        a[14] = a[6].to_i + a[7].to_i + a[8].to_i
-        a[15] = a[9].to_i + a[10].to_i + a[11].to_i
-        a[16] = a[12].to_i + a[13].to_i + a[14].to_i + a[15].to_i
+    def update_assessments_progress(data_count,staff_id)
+      data_count[12] = data_count[0].to_i + data_count[1].to_i + data_count[2].to_i
+      data_count[13] = data_count[3].to_i + data_count[4].to_i + data_count[5].to_i
+      data_count[14] = data_count[6].to_i + data_count[7].to_i + data_count[8].to_i
+      data_count[15] = data_count[9].to_i + data_count[10].to_i + data_count[11].to_i
+      data_count[16] = data_count[12].to_i + data_count[13].to_i + data_count[14].to_i + data_count[15].to_i
         # 开启事物  处理 批量修改数据
-        ActiveRecord::Base.transaction do
-          assessments = @assessments.where(staff_id: staff_id)
-          assessments.update(annual_progress: a[16], first_quarter_progress: a[12], second_quarter_progress: a[13], third_quarter_progress: a[14], fourth_quarter_progress: a[15],
-                              january_progress: a[0], february_progress: a[1], march_progress: a[2], april_progress: a[3], may_progress: a[4], june_progress: a[5],
-                              july_progress: a[6], august_progress: a[7], september_progress: a[8], october_progress: a[9], november_progress: a[10], december_progress: a[11])
-
-        end
+        assessments = @assessments.where(staff_id: staff_id)
+        assessments.update(annual_progress: data_count[16], first_quarter_progress: data_count[12], second_quarter_progress: data_count[13], third_quarter_progress: data_count[14], fourth_quarter_progress: data_count[15],
+                              january_progress: data_count[0], february_progress: data_count[1], march_progress: data_count[2], april_progress: data_count[3], may_progress: data_count[4], june_progress: data_count[5],
+                              july_progress: data_count[6], august_progress: data_count[7], september_progress: data_count[8], october_progress: data_count[9], november_progress: data_count[10], december_progress: data_count[11])
 
     end
 
     # 将统计到的数据转入a中
-    def count_data(arry,a)
-      arry.each do |d|
-        if a[d[:date]-1].present?
-          a[d[:date]-1] = a[d[:date]-1] + d[:value]
+    def count_data(data_list,data_count)
+      data_list.each do |d|
+        if data_count[d[:date]-1].present?
+          data_count[d[:date]-1] = data_count[d[:date]-1] + d[:value]
         else
-          a[d[:date]-1] = d[:value]
+          data_count[d[:date]-1] = d[:value]
         end
       end
     end

data/app/controllers/educode_sales/businesses_controller.rb

@@ -21,9 +21,10 @@ module EducodeSales
           end
 
           gon.type = params[:clazz_id].present? ? [{ value: params[:clazz_id], name: Common.find(params[:clazz_id]).name }] : []
-          gon.business_step = Common.where(clazz: 'business_step').map do |d|
+          gon.business_step = Common.where(clazz: 'business_step').order("position").map do |d|
             {value: d.id, name: d.name}
           end
+
           if can?(:create, EducodeSales::SalePlan)
             gon.menus << { title: '添加周计划', event: 'week' }
             gon.menus << { title: '添加月计划', event: 'month' }
@@ -45,6 +46,12 @@ module EducodeSales
             gon.export_menus << { title: '导出到Excel文件', event: 'export_excel' }
           end
           gon.export_menus << { title: '导出记录', event: 'export_records' }
+          filter = Filter.find_or_create_by(staff_id: @current_admin.id, clazz: "businesses_list")
+          if filter.extras.present?
+            gon.filter = filter.extras
+          else
+            gon.filter = {}
+          end
         end
         format.json do
           if @current_admin.is_admin?
@@ -316,6 +323,7 @@ module EducodeSales
       @o_name = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.name
       @clazz = Common.where(clazz: 'business_type').order("position").pluck(:name, :id)
       @stages = Common.where(clazz: 'business_step').order("position").pluck(:name, :id)
+      @deployment_type = EducodeSales::FollowUp::BUSINESS_DEPLOYMENT
       @places = Place.order("created_at desc").pluck(:name, :id)
       @last_follow_up = @business.last_follow_up
       if @last_follow_up
@@ -342,6 +350,12 @@ module EducodeSales
       size = ids.size
       ids = ids.reverse
       index = ids.index(id)
+      EducodeSales::FollowUp::BUSINESS_DEPLOYMENT.each do |m|
+        if @follow_up.o_business_deployment == m[1]
+          @show_follow_recored_deployment = m[0]
+          break
+        end
+      end
       @next_id = (index != size - 1 && size > 1) ? ids[index + 1] : 0
       @pre_id = (index != 0 && size > 1) ? ids[index - 1] : 0
       render layout: false
@@ -350,6 +364,7 @@ module EducodeSales
     def edit_follow_record
       @years = (2015..Time.now.year).to_a.reverse
       @o_name = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.name
+      @deployment_type = EducodeSales::FollowUp::BUSINESS_DEPLOYMENT
       @follow_up = FollowUp.find(params[:follow_up_id])
       @clazz = Common.where(clazz: 'business_type').order("position").pluck(:name, :id)
       @stages = Common.where(clazz: 'business_step').order("position").pluck(:name, :id)

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -226,7 +226,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, :bidded_date, :signed_date, :year)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment)
     end
 
     def teacher_params

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -13,8 +13,6 @@ module EducodeSales
         end
         format.json do
           x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
-          p "================================================================================"
-          p x_id
           if @current_admin.is_admin?
             @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids)
           else

data/app/models/educode_sales/filter.rb

@@ -0,0 +1,12 @@
+
+
+module EducodeSales
+  class Filter< ApplicationRecord
+    # belongs_to :educode_sales_staff, :class_name => 'EducodeSales::Staff'
+    belongs_to :staff
+
+    serialize :extras, Hash
+
+  end
+end
+

data/app/models/educode_sales/follow_up.rb

@@ -1,5 +1,12 @@
 module EducodeSales
   class FollowUp < ApplicationRecord
+    # todo O类商机特有字段-部署类型(因此不写入common表中)
+    BUSINESS_DEPLOYMENT =[
+      ["公有云", 1],
+      ["私有云", 2],
+      ["混合云", 3]
+    ]
+
     include ::Deletable
     belongs_to :business, counter_cache: true # counter_cache(自动计算 business对应follow_up表中对应的个数)
     belongs_to :place, optional: true