educode_sales 0.9.8 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff567b174c17bc652954bfeb48e7782de31affa2fd4995a1565bfc970b1654af
-  data.tar.gz: 8e3cb25e06155a626a838c6f96605be47e8f8f0d7bd65351210c9fae24d2a0fa
+  metadata.gz: e55869ffcc832dfac95ed169a94adac8b8fbcb634bb8aa5c3aec6b6b706f6c56
+  data.tar.gz: 81fa68ebe5aa56782e95ff35ae4583250259efb701cf4f65495e9ed189fd11d7
 SHA512:
-  metadata.gz: c8e37e4e9cd7ffa20ab9294d8f929dcc11a7c1ef0c385cb801bef72edf8f7b849664d3c0fa09725e7bc4c2abdd19d704a79ad6cd06d27cca389fa79551720bb9
-  data.tar.gz: a7ac56a8babcb87de9fef65ffcca053be0925608b345505f00e5ed26960714e8c24405af3ff2e5fe56851ed12bda269b07b348b403b92a5a2bd1da4bae6438f1
+  metadata.gz: 899de281abd3f1d782caa15f6a0db901781f4a3d370f31897816b7f44f83a07d11dbb2e9ba8830bd3428acdfdf2c028dc19c03f93fd5bfd1ca0a07f1e7b81843
+  data.tar.gz: 7c4f9d48a48aace21df084e359843a6de29189d31c54d4e828bd0cf6c6c65c7e93713e2510303ede0cc959edf5b9dcb6d1248c5c5614778837569d9957eefbff

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -242,10 +242,14 @@ module EducodeSales
 
     # o类商机增加编号
     def add_business_number
-      if (@business.number.blank?) && params[:clazz_id] == '74'
-        totual_count = EducodeSales::Business.unscoped.where("number like :data",data: "#{Time.now.year}%").count
-        current_number = Time.now.year*1000 + totual_count + 1
-        @business.update(number: current_number.to_s)
+      if ( @business.number.blank?) && params[:clazz_id] == '74'
+        totual_count = EducodeSales::Business.unscoped.where("number like :data",data: "#{Time.now.year}%").count + 1 + Time.now.year*1000.to_i
+        @business_number_record = BusinessNumberRecord.first.value
+        while @business_number_record.include?(totual_count)
+          totual_count += 1
+        end
+        @business.update(number: totual_count.to_s)
+        BusinessNumberRecord.first.update(value: @business_number_record | [ totual_count ])
       end
     end
 

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -21,8 +21,8 @@ module EducodeSales
         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.stage_id IN (?)", s_stage_ids).sum(:total_amount).round(2)
         @actual_service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).sum(:actual_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).sum(:amount).round(2)
-        @return_amount = total_return[0]['return_money']&.round(2) || 0
+        @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).sum(:amount).round(2)
+        # @return_amount = total_return[0]['return_money']&.round(2) || 0
         @receivable_amount = @goal_amount - @return_amount
 
         a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)
@@ -45,8 +45,8 @@ module EducodeSales
         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.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)
         @actual_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(:actual_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)
-        @return_amount = total_return[0]['return_money']&.round(2) || 0
+        @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)
+        # @return_amount = total_return[0]['return_money']&.round(2) || 0
         @receivable_amount = @goal_amount - @return_amount
 
         a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)

data/app/models/educode_sales/business_number_record.rb

@@ -0,0 +1,6 @@
+module EducodeSales
+  class BusinessNumberRecord < ApplicationRecord
+    serialize :value, Array
+  end
+end
+

data/db/migrate/20220920080302_add_column_number_to_educode_sales_businesses.rb

@@ -0,0 +1,6 @@
+class AddColumnNumberToEducodeSalesBusinesses < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_businesses, :number, :string, comment: "只有o类商机才有编号 "
+
+  end
+end

data/db/migrate/20220923084102_create_table_to_busines_number_recoreds.rb

@@ -0,0 +1,7 @@
+class CreateTableToBusinesNumberRecoreds < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_business_number_records do |t|
+      t.longtext :value, comment: "o类商机的所有使用过的编号"
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.8'
+  VERSION = '0.9.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.10
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -188,6 +188,7 @@ files:
 - app/models/educode_sales/assign_follow_up.rb
 - app/models/educode_sales/business.rb
 - app/models/educode_sales/business_export_record.rb
+- app/models/educode_sales/business_number_record.rb
 - app/models/educode_sales/business_relation_ship.rb
 - app/models/educode_sales/common.rb
 - app/models/educode_sales/course_subject.rb
@@ -474,7 +475,9 @@ files:
 - db/migrate/20220523023609_update_assessment_month_column_to_assessment_settings.rb
 - db/migrate/20220523101628_update_column_to_follow_ups.rb
 - db/migrate/20220827130438_create_educode_sales_login_histories.rb
+- db/migrate/20220920080302_add_column_number_to_educode_sales_businesses.rb
 - db/migrate/20220921131116_add_change_clazz_to_follow_up.rb
+- db/migrate/20220923084102_create_table_to_busines_number_recoreds.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb