educode_sales 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4077a88dda68d0d254896b4edb4b5e4595837753a46af5928bcf9f9a77deb5de
-  data.tar.gz: 2d0aec24b5793b9ff61095a48e175a7a7d3d6f118588f4497284d67f05cccbd4
+  metadata.gz: 2452ba0a38c51eeb2288c262c3749009e8a73482fa5bb3762cf3d8cac604f7fd
+  data.tar.gz: c0d98a9cb2d391b3a5c4600bf317c5d47aeb0fc14d8ca95ef12a049f228a67c3
 SHA512:
-  metadata.gz: 447ee2216fa0b7a01275361ef69aee2dbc998543e4bc92419f672eb2d5e5ebf9c134018544a61d45497e0ed970c6ad407bb1ebc8431104f1b6ece973528d73b1
-  data.tar.gz: e9392595b91bd5353f785b586c7bef4367c087eb13b1de1285968f84b9758fb7c967fed2306c25098c056dd4e214870dad8e755ef2f305581f2460bb9692bc0d
+  metadata.gz: 523896d3267cec4e5bf9681e8d15b02af20dcdfa1fba104a8f698fffac80f0f553627480f0e8a71df4052a46b8402e92d34b0daac34005cfb347a25395b9546d
+  data.tar.gz: f80418f62799d2ccb0c8ed839cb3c5e1aa0cb0e941f666eef5b2e596ff273ec02b5c6a0fda81154631d588bde03aabc0d6cf3a0ca10f7eac2f35f43b91e75a7d

data/app/controllers/educode_sales/businesses_controller.rb

@@ -88,7 +88,7 @@ module EducodeSales
 
           end
 
-          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已中标商机)"
+          if params[:q].present? && params[:q][:name].present? && (params[:q][:name] == "(销售态势-" + @year + "-已中标商机)" || params[:q][:name] == "(销售态势-" + @year + "-应收款商机)")
             stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
             if @year == '全部'
               @businesses = @businesses.joins("
@@ -119,10 +119,11 @@ module EducodeSales
             x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
             year_time = "#{@year}-01-01 00:00:00"
             year_over_time = "#{@year}-12-31 23:59:59"
+            money_plan_clazz = 1
             if @year == '全部'
-              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", 1).distinct
+              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", money_plan_clazz).distinct
             else
-              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).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).distinct
+              @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= ?", money_plan_clazz).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).distinct
             end
           end
 
@@ -137,7 +138,7 @@ module EducodeSales
           end
 
           @businesses = @businesses
-          if params[:q].present? && params[:q][:name].present? && params[:q][:name] != "(销售态势-" + @year + "-已中标商机)" && params[:q][:name] != "(销售态势-" + @year + "-已签单商机)" && params[:q][:name] != "(销售态势-" + @year + "-已回款商机)" && params[:q][:name] != "(销售态势-" + @year + "-现有商机)"
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] != "(销售态势-" + @year + "-已中标商机)" && params[:q][:name] != "(销售态势-" + @year + "-已签单商机)" && params[:q][:name] != "(销售态势-" + @year + "-已回款商机)" && params[:q][:name] != "(销售态势-" + @year + "-现有商机)" && params[:q][:name] != "(销售态势-" + @year + "-应收款商机)"
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
           end
           if params[:q].present? && params[:q][:department].present?
@@ -460,7 +461,7 @@ module EducodeSales
 
           end
 
-          if params[:name].present? && params[:name] == "(销售态势-" + @year + "-已中标商机)"
+          if params[:name].present? && (params[:name] == "(销售态势-" + @year + "-已中标商机)" || params[:name] == "(销售态势-" + @year + "-应收款商机)")
             stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
             if @year == '全部'
               @businesses = @businesses.joins("
@@ -509,7 +510,7 @@ module EducodeSales
           end
 
           @businesses = @businesses
-          if params[:name].present? && params[:name] != "(销售态势-" + @year + "-已中标商机)" && params[:name] != "(销售态势-" + @year + "-已签单商机)" && params[:name] != "(销售态势-" + @year + "-已回款商机)" && params[:name] != "(销售态势-" + @year + "-现有商机)"
+          if params[:name].present? && params[:name] != "(销售态势-" + @year + "-已中标商机)" && params[:name] != "(销售态势-" + @year + "-已签单商机)" && params[:name] != "(销售态势-" + @year + "-已回款商机)" && params[:name] != "(销售态势-" + @year + "-现有商机)"&&  params[:name] != "(销售态势-" + @year + "-应收款商机)"
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:name]}%")
           end
           if params[:department].present?

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -13,12 +13,18 @@ module EducodeSales
       if (@year == '全部')
         @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).sum(:total_amount).round(2)
         stage_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
-        @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", stage_ids).sum(:total_amount).round(2)
+        # 中标总金额， 已回款总金额
+        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")
+        @goal_amount = total_return[0]['total']&.round(2) || 0
+
         @actual_goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", stage_ids).sum(:actual_amount).round(2)
         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 = 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)
         @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).sum(:total_amount).round(2)
         b = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name).pluck(:id)
@@ -26,16 +32,23 @@ module EducodeSales
       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 != ?", x).where("educode_sales_follow_ups.year = ?", @year).sum(:total_amount).round(2)
         stage_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
-        @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.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids).sum(:total_amount).round(2)
+
+        # 中标总金额， 已回款总金额
+        total_return = 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.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids).select("sum(total_amount) AS total, sum(educode_sales_businesses.return_money) AS return_money")
+        @goal_amount = total_return[0]['total']&.round(2) || 0
+
         @actual_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.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids).sum(:actual_amount).round(2)
         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 = 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)
         @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)
         b = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name).pluck(:id)
@@ -63,12 +76,12 @@ module EducodeSales
       names = EducodeSales::Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id, d.role_id] }
       x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
       x_business_ids = EducodeSales::Business.joins(last_follow_up: :clazz).where("educode_sales_commons.id = ?",x).pluck :id
-     
+
       @follow_count_range = params[:follow_count_range] || "week"
       # 商机跟进数图表
       respond_to do |format|
         format.html do
-          
+
         end
         format.js do
           default_dates = (30.day.ago.to_date..Date.today).map { |d| d.strftime("%Y-%W") }.uniq #默认时间范围
@@ -141,14 +154,14 @@ module EducodeSales
           render json: {data: @follow_count_data }
         end
       end
-   
+
     end
 
     # 销售额分析
     def sales_analysis
       respond_to do |format|
         format.html do
-          
+
         end
         format.js do
           x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
@@ -186,7 +199,7 @@ module EducodeSales
     def business_area
       respond_to do |format|
         format.html do
-          
+
         end
         format.js do
           x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
@@ -238,7 +251,7 @@ module EducodeSales
     def sales_followup_analysis
       respond_to do |format|
         format.html do
-          
+
         end
         format.js do
           #  销售人员跟进分析

data/app/views/educode_sales/sale_trends/_business_area.html.erb

@@ -22,7 +22,7 @@
         </div>
       </form>
     </div>
-    <canvas id="myChart3" width="960" height="200"></canvas>
+    <canvas id="myChart3" width="960" height="400"></canvas>
   </div>
 
 </div>
@@ -30,7 +30,7 @@
 
   layui.use(['form', 'jquery', 'request', 'element'], function () {
      form = layui.form;
-     
+
       var opt = {
         events: false,
         tooltips: {

data/app/views/educode_sales/sale_trends/_business_followup_analysis.html.erb

@@ -24,7 +24,7 @@
         </div>
       </form>
     </div>
-    <canvas id="myChart" width="960" height="200"></canvas>
+    <canvas id="myChart" width="960" height="400"></canvas>
   </div>
 </div>
 <script>
@@ -47,7 +47,7 @@
         elem: '#date',
         range: true
       });
-      
+
       laydate.render({
         elem: '#date_week',
         range: true
@@ -94,7 +94,7 @@
           type: 'GET',
           dataType: "json",
           data: $.param(data.field, true),
-          success: function (res) { 
+          success: function (res) {
             layer.close(layer_index);
             if (res.success == false) {
               layer.alert(res.msg)

data/app/views/educode_sales/sale_trends/_sales_analysis.html.erb

@@ -29,7 +29,7 @@
         </div>
       </form>
       </div>
-      <canvas id="myChart2" width="960" height="200"></canvas>
+      <canvas id="myChart2" width="960" height="400"></canvas>
 
   </div>
 </div>
@@ -37,7 +37,7 @@
   var goal_type = "<%=@goal_count_range %>";
   layui.use(['form', 'jquery', 'request', 'element'], function () {
      form = layui.form;
-     
+
       var opt = {
         events: false,
         tooltips: {

data/app/views/educode_sales/sale_trends/_sales_followup_analysis.html.erb

@@ -28,13 +28,13 @@
       </div>
     </form>
   </div>
-  <canvas id="myChart4" width="960" height="200"></canvas>
+  <canvas id="myChart4" width="960" height="400"></canvas>
 </div>
 <script>
   var customer_time_range = "<%= params[:customer_time_range] %>";
   layui.use(['form', 'jquery', 'request', 'element'], function () {
      form = layui.form;
-     
+
       var opt = {
         events: false,
         tooltips: {

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -184,6 +184,19 @@
                     </div>
                   </div>
 
+                  <div class="layui-col-xs3">
+                    <div class="panel layui-bg-number">
+                      <div class="panel-body">
+                        <div class="panel-title">
+                          <h5>应收款<a href="/missions/businesses?name=(销售态势-<%=@year %>-应收款商机)"  style="color: #0000FF;float: right">查看商机</a></h5>
+                        </div>
+                        <div class="panel-content y-t-10">
+                          <h1 class="no-margins"><%= @receivable_amount %>万</h1>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+
                   <div class="layui-col-xs3">
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
@@ -195,7 +208,7 @@
                         </div>
                       </div>
                     </div>
-                </div>
+                  </div>
                 </div>
               </div>
             </div>
@@ -243,7 +256,7 @@
             loadPage('/missions/sale_trends/sales_followup_analysis')
           }
         });
-        
+
 
         function loadPage(url) {
           var layer_index = layer.load(0, {shade: [0.1, '#fff']});
@@ -251,7 +264,7 @@
             url: url,
             type: 'GET',
             dataType: "script",
-            success: function (res) { 
+            success: function (res) {
               layer.close(layer_index);
             }
           });
@@ -291,7 +304,7 @@
           year = data.value
           window.location.href = "/missions/sale_trends/trends?year=" + data.value
         })
-  
+
         editForm("chance_money");
         editForm("ballot_money");
         editForm("sign_money");

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails