educode_sales 0.8.1 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb565ace898040e094fd5bb5659ba71b471f4d3c6d718f5b0d52c8d0b3b78329
-  data.tar.gz: 5c235c5d885f53def688cf0cf1f6bbfb8a33de88de4811249f54fb69cab34665
+  metadata.gz: e81ffa1210f4f5cf1b6a1fbed46e14c1e2b48ceadf4d3ddbd783e99105d6f0c5
+  data.tar.gz: 2a72d7ccfbdc57d17da213dfd434413d240db5f875e7dbe93ee4c39999fb3060
 SHA512:
-  metadata.gz: 2471c1f71f7e9bd3a724a932462fec5eeac8a292d1e7c25938120fbbe25d1c2063d381aa4cca78d8eaa1519b2690b57b02b4e8f1392c28c387f7c4cfc13d9b2a
-  data.tar.gz: 7fe56251df0ff25212c1a3bbc5b9ce9f4c0f418d5e445e4b90eca2ff324ce12f9cd3f4fbfe3d712610dfb513531977713a7e23af5485944277c4b838539160d1
+  metadata.gz: d41222b3cb5afb884164c80fd17f5ce9c2babd2fd8130a21099388d8bfe891972d76519216d06d7be6aad9ec459490ad1bd6c17353c077ad242980557833f42a
+  data.tar.gz: aec876dddf899182e2f5e43fa5adb136d55e9db1864842ce7da6d151b73e99c7325098d6388044fe50648dfa5da0c3f14818917b49a7233c7027bd93fd77f8b2

data/app/controllers/educode_sales/application_controller.rb

@@ -28,25 +28,15 @@ module EducodeSales
     end
 
     def filter
-      filter = Filter.find_or_create_by(staff_id: @current_admin.id, filter_type: params[:type])
-      params[:hidden] = params[:hidden] == "true" ? "0":"1"
-      a = ''
-      b = []
-      filter.filter_data&.split(",")&.each do |d|
-        b << d[0..-2]
-        if d[0..-2] == params[:name]
-          d[-1] = params[:hidden]
-        end
-        a = a + d + ','
+      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
-      if b.include?(params[:name]) == false
-        p "include"
-        a = a + params[:name] + params[:hidden]
-        p a
-      end
-      filter.filter_data = a
-      filter.save
-      render_success
     end
 
 

data/app/controllers/educode_sales/assessments_controller.rb

@@ -18,19 +18,16 @@ module EducodeSales
             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, filter_type: "assessments_setup")
-            gon.filter = {}
-            filter.filter_data&.split(",")&.each do |d|
-              m = d[0..-2]
-              # gon.filter[:"#{m}"] = d[-1].to_i # 前端的hide注意时int类型 string类型 获取不到
-              gon.filter["#{m}"] = d[-1].to_i # 前端的hide注意时int类型 string类型 获取不到
+            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
-            # p gon.filter
-            # gon.filter2 = {:username => false }
-            # gon.filter3 = '1'
-            # p gon.filter
           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)
@@ -45,18 +42,18 @@ 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"
-      AssessmentsSetting.transaction do
+        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  OneError => e
+      rescue  => e
         render_failure '增加数据错误'
       end
     end
@@ -96,7 +93,7 @@ module EducodeSales
         assessment = AssessmentsSetting.find(params[:id])
         assessment.destroy
         render_success
-      rescue OneError => e
+      rescue  => e
         render_failure '暂不能删除'
       end
     end
@@ -170,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
 
@@ -198,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 实际回款 )
       @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
 
@@ -247,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
 
@@ -274,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)  #  批量更新assessment数据  事物  一个commit
+        count_data(data_list,data_count)  #  统计数据
+        update_assessments_progress(data_count, d)  #  批量更新assessment数据  事物  一个commit
       end
     end
 
@@ -309,27 +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
         # 开启事物  处理 批量修改数据
         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])
+        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

@@ -46,12 +46,11 @@ module EducodeSales
             gon.export_menus << { title: '导出到Excel文件', event: 'export_excel' }
           end
           gon.export_menus << { title: '导出记录', event: 'export_records' }
-
-          filter_businesses_list = Filter.find_or_create_by(staff_id: @current_admin.id, filter_type: "businesses_list")
-          gon.business_filter = {}
-          filter_businesses_list.filter_data&.split(",")&.each do |d|
-            m = d[0..-2]
-            gon.business_filter["#{m}"] = d[-1].to_i
+          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
@@ -324,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
@@ -350,6 +350,12 @@ module EducodeSales
       size = ids.size
       ids = ids.reverse
       index = ids.index(id)
+      EducodeSales::FollowUp::BUSINESS_DEPLOYMENT[1..-1].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
@@ -358,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

@@ -5,13 +5,7 @@ module EducodeSales
     # belongs_to :educode_sales_staff, :class_name => 'EducodeSales::Staff'
     belongs_to :staff
 
-    # serialize :filter_data, Json
-
-
-
-
-
-
+    serialize :extras, Hash
 
   end
 end

data/app/models/educode_sales/follow_up.rb

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