educode_sales 1.10.33 → 1.10.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22b7976d2189b10d3280296023ca6d52fbb050307cf59d6b83c81547d5fee47e
-  data.tar.gz: 4c81b96887d55e9bc415d2a0f0359884cb196a1dc900d9fc56b837585f6f882b
+  metadata.gz: 52b8f7e5581a123fa5c31a62315e82bec3319527020fa03913bffcfd1042b06e
+  data.tar.gz: 11e3cfc12f2f4c596d89eb4688342272eaafea877c617b5402ecc577911fcb62
 SHA512:
-  metadata.gz: 3697ec424b22d9ed64d8aa5d8e10665c719826651441a597376170287e0b9e54b565ec6ec0d5c545755a6899f5ea9ce5d530ab92daf36a92f843ffbd9d035f47
-  data.tar.gz: c8a57001d38e3ca5f824167565b668228de6e089be99b44bd07b92732a6971fb3aa296b2abd0f945311b01dfa019887faf7a0a1e60b1924a0560d84b7979c329
+  metadata.gz: 954e4d382776f70d03b3e97fac74cc2d1bd28d1abb712ca5a438910290463608a90dc52404f400e729d80085c097f50c7fd0e92e188b8b8789ee427c3b861485
+  data.tar.gz: 908bc050383f64a1b199f6444094b5c72fe901f2a8b28ca6e8cb950ce7b6edeec2aac2c4d5fce52f26d32f76ca4345ee1114b154f33bf89efe11714e871b9f2c

data/app/controllers/educode_sales/businesses_controller.rb

@@ -133,7 +133,19 @@ module EducodeSales
             elsif params[:q][:clazz] == 'delete_list'
               @businesses = Business.unscoped.where(state_id: [1, 3])
             elsif params[:q][:clazz] == 'plan_year'
-              @businesses = Business.joins(:last_follow_up).where("educode_sales_follow_ups.plan_a_date > :year OR educode_sales_follow_ups.plan_return_date > :year OR educode_sales_follow_ups.invitation_at > :year", year: Time.now.beginning_of_year)
+              if @current_admin.is_admin?
+                @businesses = Business
+              else
+                # 年度计划，按负责区域和专项客户类型查看对应的年度商机
+                school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
+                if @current_admin.staff_school_tags.present?
+                  # 如果设置专项客户类型，则视为专项经理，根据专项客户查看对应商机
+                  school_ids += School.joins(:school_tags).where("school_tags.id in (?)", @current_admin.staff_school_tags.pluck(:school_tag_id)).pluck(:id)
+                end
+                @businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) ", school_ids.uniq)
+              end
+              
+              @businesses = @businesses.joins(:last_follow_up).where("educode_sales_follow_ups.plan_a_date > :year OR educode_sales_follow_ups.plan_return_date > :year OR educode_sales_follow_ups.invitation_at > :year", year: Time.now.beginning_of_year)
             end
           else
             if @current_admin.is_admin?

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -24,7 +24,13 @@ module EducodeSales
         @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 = EducodeSales::MoneyPlanRecord.joins(:money_plan_claims).sum(:amount).round(2)
+        @return_amount = EducodeSales::MoneyPlanRecord.from("(
+          SELECT distinct(educode_sales_money_plan_records.id), educode_sales_money_plan_records.amount
+          FROM educode_sales_money_plan_records
+          JOIN educode_sales_money_plan_claims ON educode_sales_money_plan_claims.money_plan_record_id = educode_sales_money_plan_records.id
+          GROUP BY educode_sales_money_plan_records.id
+          ) AS educode_sales_money_plan_records
+        ").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
@@ -54,7 +60,13 @@ module EducodeSales
         @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 = EducodeSales::MoneyPlanRecord.joins(:money_plan_claims).where("educode_sales_money_plan_records.date_at >= ?  AND educode_sales_money_plan_records.date_at <= ? ", year_time, year_over_time).sum(:amount).round(2)
+        @return_amount = EducodeSales::MoneyPlanRecord.from("(
+          SELECT distinct(educode_sales_money_plan_records.id), educode_sales_money_plan_records.amount, date_at
+          FROM educode_sales_money_plan_records
+          JOIN educode_sales_money_plan_claims ON educode_sales_money_plan_claims.money_plan_record_id = educode_sales_money_plan_records.id
+          GROUP BY educode_sales_money_plan_records.id
+          ) AS educode_sales_money_plan_records
+        ").where("educode_sales_money_plan_records.date_at >= ?  AND educode_sales_money_plan_records.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)
         # # 往年累计已回款

data/app/views/educode_sales/ideas/_index.html.erb

@@ -56,7 +56,7 @@
         </div>
       </div>
       <div class="layui-inline">
-        <label class="layui-form-label">项目名称</label>
+        <label class="layui-form-label">商机名称</label>
         <div class="layui-input-inline">
           <input type="text" class="layui-input" id="name" name="name" placeholder=" - " autocomplete="off">
         </div>
@@ -167,7 +167,7 @@
                 {
                     field: 'name',
                     width: 160,
-                    title: '项目名称',
+                    title: '商机名称',
                     hide: gon.filter.name
                 },
                 {

data/app/views/educode_sales/ideas/edit.html.erb

@@ -41,7 +41,7 @@
           </div>
         </div>
         <div class="layui-col-md6">
-          <labeL class="layui-form-label">项目名称:</labeL>
+          <labeL class="layui-form-label">商机名称:</labeL>
           <div class="layui-input-block">
             <div id="business_id" style="width: 600px;"></div>
           </div>

data/app/views/educode_sales/ideas/new.html.erb

@@ -41,7 +41,7 @@
           </div>
         </div>
         <div class="layui-col-md6">
-          <labeL class="layui-form-label">项目名称:</labeL>
+          <labeL class="layui-form-label">商机名称:</labeL>
           <div class="layui-input-block">
             <div id="business_id" style="width: 600px;"></div>
           </div>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.33'
+  VERSION = '1.10.34'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.33
+  version: 1.10.34
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-13 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails