educode_sales 0.9.15 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd9571c825586b6b901720a7acfd9ac401a2e84f1b3bb98224833b5de7578fa7
-  data.tar.gz: 7a6765a20f54183d0381f712b6ec5252ad3ccc23f9878dccd319e554196a3b34
+  metadata.gz: 6356a47918d891333b14e6db67f9e7fbf45ff008c04cb06ec89f7a5ea1dd34cf
+  data.tar.gz: 55aaca16b358087288298d0abbaf579340b4dd5dc2b53b39c4a6d1cb80b31c26
 SHA512:
-  metadata.gz: 3e2896e169cefb432bff39d3c7939ede157dc7b8afdc93e47819eeed88f724153b3687aa6abff9fc97497d724aed80673b3be15c51999abd493fa37aa4303db9
-  data.tar.gz: f3ab93cbdece2c12457716f81a7d0b69f8e1b00d87c8abb68b079ad5c2e98294e0c83162acfca3e391337e326c17fd5883d976e664f12ea339cfa366efb240d4
+  metadata.gz: 8f8f2febaa9f93c3ce44766b4ddc45930db17c21c405ebe542f0e7c4ca862c6f3c7840c5b02b5e06efdea128411ef8ab40cb64105f3f32cde31aeafe35e9afea
+  data.tar.gz: 8556d4243ffc1208725c7ec4e7a59f83b11088d9b064b20d36ba238a05e90536ac885cc53c76dd8e1b9f79f3e5290fa00ff9b9c20bfcb0b4d104d6fa8adb496d

data/app/controllers/educode_sales/businesses_controller.rb

@@ -97,7 +97,7 @@ module EducodeSales
 
           end
 
-          if params[:q].present? && params[:q][:name].present? && (params[:q][:name] == "(销售态势-" + @year + "-已中标商机)" || params[:q][:name] == "(销售态势-" + @year + "-应收款商机)")
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已中标商机)"
             stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
             if @year == '全部'
               @businesses = @businesses.joins("
@@ -136,6 +136,21 @@ module EducodeSales
             end
           end
 
+           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-应收款商机)"
+            stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
+            if @year == '全部'
+              @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.stage_id IN (?)", stage_ids)
+            else
+              @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.stage_id IN (?)", "#{@year}-12-31", stage_ids)
+            end
+
+          end
+
+
           if params[:q].present? && params[:q][:all].present?
             @businesses = @businesses
           end
@@ -249,7 +264,7 @@ module EducodeSales
             (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
             last_follow.total_amount
             ").joins("
-            LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
+            LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id AND last_follow.deleted_at IS NULL
           ").page(params[:page]).per(params[:limit])
 
         end
@@ -480,7 +495,7 @@ module EducodeSales
 
           end
 
-          if params[:name].present? && (params[:name] == "(销售态势-" + @year + "-已中标商机)" || params[:name] == "(销售态势-" + @year + "-应收款商机)")
+          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-已中标商机)"
             stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
             if @year == '全部'
               @businesses = @businesses.joins("
@@ -494,6 +509,20 @@ module EducodeSales
 
           end
 
+          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-应收款商机)"
+            stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
+            if @year == '全部'
+              @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.stage_id IN (?)",stage_ids)
+            else
+              @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.stage_id IN (?)", "#{@year}-12-31", stage_ids)
+            end
+
+          end
+
           if params[:name].present? && params[:name] == "(销售态势-" + @year + "-已签单商机)"
             s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
             if @year == '全部'
@@ -615,7 +644,7 @@ module EducodeSales
             last_follow.actual_amount,
             (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
             last_follow.total_amount").joins("
-            LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
+            LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id AND last_follow.deleted_at IS NULL
           ")
         end
       end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -21,9 +21,13 @@ 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
-        @receivable_amount = @goal_amount - @return_amount
+
+        # @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
+
+        @receivable_amount = 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(educode_sales_follow_ups.actual_amount) - SUM(educode_sales_businesses.return_money)) AS num")
+        @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)
@@ -48,10 +52,13 @@ module EducodeSales
         @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)
 
         # 往年累计已中标合同
-        @former_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.stage_id IN (?)", "#{@year}-12-31", stage_ids).sum(:actual_amount).round(2)
-        # 往年累计已回款
-        @former_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_over_time).sum(:amount).round(2)
-        @receivable_amount = @former_goal_amount - @former_return_amount
+        # @former_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.stage_id IN (?)", "#{@year}-12-31", stage_ids).sum(:actual_amount).round(2)
+        # # 往年累计已回款
+        # @former_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_over_time).sum(:amount).round(2)
+        # @receivable_amount = @former_goal_amount - @former_return_amount
+
+        @receivable_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.stage_id IN (?)", "#{@year}-12-31", stage_ids).select("(SUM(educode_sales_follow_ups.actual_amount) - SUM(educode_sales_businesses.return_money)) AS num")
+        @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)
@@ -176,7 +183,7 @@ module EducodeSales
 
           goal_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%m") }.uniq
           sale_names = ['已中标', '已签单', '已回款']
-         
+
           if params[:goal_count_range].present?
             case params[:goal_count_range]
             when "week"
@@ -572,7 +579,7 @@ module EducodeSales
         if last_month != month.split("-")[0]
           last_sum = 0
         end
-   
+
         data_3_total_hash[month] = (data_3_hash[month] || 0) + last_sum
         last_sum += data_3_hash[month] || 0
         last_month = month.split("-")[0]

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.15'
+  VERSION = '0.9.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.16
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2022-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
-- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -487,7 +486,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -502,8 +501,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.0.0
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []