educode_sales 0.9.90 → 0.9.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9351b319e5233520bc0142f08f640e76f0a7e6bd4130d22d51dacf1c8f9ffd3
-  data.tar.gz: 2d1746cb8a15868876e610067193f3a4dd3bd6ae3bdf1cb23d8b686494ac5c82
+  metadata.gz: cb711cb66d6db0b32c6c7a79c5bc38e1fb277b6b0b1b0dcb82e656d13de8b182
+  data.tar.gz: c22d6b9965826d1464f59316f9f1f50edb75b86ecb5cbe60636f06293b9a3a6d
 SHA512:
-  metadata.gz: 12b2e73029794f3e8553b56c7813cb6d44a0b58cbcbae4fddf851f2d527722f6485cfca6666e24c410210c60730653dc80efa7f26617dd53bc3b315eb38e40ad
-  data.tar.gz: 481c5795832e343e411d1ede2c13ebe47b1e135a0d14425d2e4a0a1e6a8f88c9e16a80440210b4029291fd6fe749df9e7e467aa9a6f9dfcc41f651ad293bfdee
+  metadata.gz: 13102675d29578ec7dfdd1f410744079b543db7a39e0406d936ff27f962f56826d06e7b9c506dfce137e0a3a875351b319a811a227d05012f2fe4725b7510adf
+  data.tar.gz: 026bc860c82d11b845947de3be099b6dbc248b777a94ef479022da16018d55e763d2c060f54b91f6baa8028ab2564f4af5616134d304339654ab78f79322a204

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -11,7 +11,7 @@ module EducodeSales
       x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
       o = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
       if (@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)
+        @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).sum(:budget_amount).round(2)
         stage_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
         # 中标总金额， 已回款总金额
         total_return = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", stage_ids).select("sum(total_amount) AS total, sum(educode_sales_businesses.return_money) AS return_money")
@@ -30,15 +30,15 @@ module EducodeSales
         @receivable_amount = @receivable_amount.present? && @receivable_amount[0]['num'] ? @receivable_amount[0]['num'].round(2) : 0
 
         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)
+        @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).sum(:budget_amount).round(2)
         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)
+        @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", b).sum(:budget_amount).round(2)
       else
         year_time = "#{@year}-01-01 00:00:00"
         year_over_time = "#{@year}-12-31 23:59:59"
 
         @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.year <= ?", @year).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).where("educode_sales_follow_ups.year <= ?", @year).sum(:budget_amount).round(2)
         stage_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
 
         # 中标总金额， 已回款总金额
@@ -61,9 +61,9 @@ module EducodeSales
         @receivable_amount = @receivable_amount.present? && @receivable_amount[0]['num'] ? @receivable_amount[0]['num'].round(2) : 0
 
         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).where("educode_sales_follow_ups.year <= ?", @year).sum(:total_amount).round(2)
+        @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).where("educode_sales_follow_ups.year <= ?", @year).sum(:budget_amount).round(2)
         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).where("educode_sales_follow_ups.year <= ?", @year).sum(:total_amount).round(2)
+        @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", b).where("educode_sales_follow_ups.year <= ?", @year).sum(:budget_amount).round(2)
       end
 
     end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.90'
+  VERSION = '0.9.91'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.90
+  version: 0.9.91
 platform: ruby
 authors:
 - anke1460