educode_sales 0.9.40 → 0.9.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41be1a85301a5d440bb31501f01a0ff9db5158f0890c5096916ff238ffc34e38
-  data.tar.gz: 81a70162b88c7d09eaf90b4181177f757d993264761d65ec376e7719307da53e
+  metadata.gz: bbfbd499c3b8b9a0b17b3178a95cb9bf9599376ef9d372e04c4fc42c54d9e93d
+  data.tar.gz: 1d8c044c648874c7cc36035a0c0271bc1017d3bae1fa051e546d094cfb8a6803
 SHA512:
-  metadata.gz: 99f2999ebcb569c813f3251d060e0347a5a2e488ae1f778d4a51b594ff03416854f7ef9ae8cc0fe5a433f95417801a7549c16e56f1c8a96d0e031a6ec2b9539b
-  data.tar.gz: 62a7671b59dbb8ffb5ad827d310ead46aecf6c5de76b6151d4d6c0c56a81c6835a490c4171d4ee55e40317af0098e30ad87ebab6e9be0be112442a0c15747ddc
+  metadata.gz: b8507c1f295984000ec4cd5d650c46d42efd0bba14479039da5f3cf7b2c3e63b272d38219ed175f305743029721d6e11bd293be9a7f62683924480717ef93464
+  data.tar.gz: 4c7dbc8bff6bdc3c6ffa8152a5efde7463e60ed60bfd560cef86f2d3fead6843c1ae561c62bd640e0ebacf9b43590ebf1b07d74981d7688cd5f4f87c77ee3a98

data/app/controllers/educode_sales/businesses_controller.rb

@@ -95,20 +95,42 @@ module EducodeSales
           end
         end
         format.json do
-          if @current_admin.is_admin?
-            @businesses = Business
+          if params[:q] && (params[:q][:clazz] == 'area' || params[:q][:clazz] == 'special')
+            if params[:q][:clazz] == 'special'
+            school_ids = []
+            # 专项商机
+            school_tag_ids = @current_admin.staff_school_tags.pluck(:school_tag_id)
+            school_ids = SchoolTagMiddle.where(school_tag_id: school_tag_ids).pluck(:school_id)
+            @businesses = Business.joins("JOIN departments AS dp ON educode_sales_businesses.department_id = dp.id").where("dp.school_id in (?)", school_ids)
+          elsif params[:q][:clazz] == 'area'
+            school_ids = []
+            # 区域管理商机
+            school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
+            @businesses = Business.joins("JOIN departments  AS dp ON educode_sales_businesses.department_id = dp.id").where("dp.school_id in (?)", school_ids)
+          end
           else
-            level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
-            case level
-            when '自己'
-              business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
-              @businesses = Business.where("educode_sales_businesses.staff_id = ? OR educode_sales_businesses.id in (?)", @current_admin.id, business_ids)
-            when '区域'
-              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
-              business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
-              @businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}  OR educode_sales_businesses.id in (?)", school_ids, business_ids)
-            else
+            if @current_admin.is_admin?
               @businesses = Business
+            else
+              level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
+              case level
+              when '自己'
+                business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
+                @businesses = Business.where("educode_sales_businesses.staff_id = ? OR educode_sales_businesses.id in (?)", @current_admin.id, business_ids)
+              when '区域'
+              
+                school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
+                if can?(:special, EducodeSales::Business)
+                # 专项商机
+                  school_tag_ids = @current_admin.staff_school_tags.pluck(:school_tag_id)
+                  tag_school_ids = SchoolTagMiddle.where(school_tag_id: school_tag_ids).pluck(:school_id)
+                  school_ids += tag_school_ids
+                end
+                business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
+                @businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}  OR educode_sales_businesses.id in (?)", school_ids, business_ids)
+              else
+                @businesses = Business
+              end
             end
           end
           if params[:q].present? && params[:q][:name].present?
@@ -116,8 +138,6 @@ module EducodeSales
           end
 
           # @budget_stage_ids = Common.where(clazz: '商机阶段', name: ['初步接洽', '准备方案','已交方案', '已立项']).pluck(:id)
-
-
           if params[:q] && params[:q][:signed_date].present?
             date = params[:q][:signed_date].split(" - ")
             @businesses = @businesses.joins("
@@ -178,6 +198,12 @@ module EducodeSales
             ").where("educode_sales_follow_ups.year = ?", params[:q][:business_year])
           end
 
+          if params[:q].present? && params[:q][:year].present?
+            @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.year <= ?", params[:q][:year])
+          end
+
           if params[:q].present? && params[:q][:o_business_deployment].present?
             @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
@@ -538,6 +564,12 @@ module EducodeSales
             ").where("educode_sales_follow_ups.year = ?", params[:business_year])
           end
 
+          if params[:year].present?
+            @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.year <= ?", params[:year])
+          end
+
           if params[:all].present?
             @businesses = @businesses
           end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -88,7 +88,7 @@ module EducodeSales
         follow_up.clazz_changed = last_follow_up.clazz_id != follow_up.clazz_id
         if follow_up.clazz_changed 
           clazz_changes = "#{last_follow_up.clazz.extras.split('_')[0]}-#{follow_up.clazz.extras.split('_')[0]}"
-          business_clazz_change = @business.business_clazz_changes.find_or_initialize_by clazz_changed: clazz_changes
+          business_clazz_change = EducodeSales::BusinessClazzChange.find_or_initialize_by(business_id: @business.id, clazz_changed: clazz_changes)
           business_clazz_change.save unless business_clazz_change.persisted?
         end
       end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -38,7 +38,7 @@ module EducodeSales
         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(:total_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(:total_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(:total_amount).round(2)
       end
 
     end

data/app/controllers/educode_sales/staffs_controller.rb

@@ -52,6 +52,8 @@ module EducodeSales
       # gon.school_ids = School.all.ids
       # gon.schools = School.all.first(100).map { |d| { value: d.id, title: d.name } } #.unshift({value: -1, title: '全国'})
       @staff_types = Common.where(clazz: 'staff_type').pluck(:name, :id)
+      tag_ids = @staff.staff_school_tags.pluck(:school_tag_id)
+      gon.school_properties = SchoolTag.where(weight: 1).map { |d| {value: d.id, name: d.name, selected: tag_ids.include?(d.id) }  }
       render layout: false
     end
 
@@ -87,13 +89,20 @@ module EducodeSales
       end
       staff.areas = commons
       if params[:school_ids].present?
-        staff.staff_schools.destroy_all
+        schools = []
         params[:school_ids].each do |d|
-          staff.staff_schools.create(school_id: d)
+          schools << EducodeSales::StaffSchool.find_or_initialize_by(staff_id: staff.id, school_id: d)
         end
+        staff.staff_schools = schools
       else
         staff.staff_schools.destroy_all
       end
+      tags = []
+      params[:school_tag_ids].each do |tag_id|
+       tags << EducodeSales::StaffSchoolTag.find_or_initialize_by(staff_id: staff.id, school_tag_id: tag_id)
+      end
+     
+      staff.staff_school_tags = tags
       params[:current_admin] = @current_admin.id
       impressionist(staff, params)
       if staff.save

data/app/models/educode_sales/business_clazz_change.rb

@@ -1,7 +1,7 @@
 module EducodeSales
   class BusinessClazzChange < ApplicationRecord
     belongs_to :business
-    validates :clazz_changed, uniqueness: { message: '已存在' }
+    validates :clazz_changed, uniqueness: {scope: :business_id, message: '已存在' }
 
 
 

data/app/models/educode_sales/staff.rb

@@ -19,6 +19,8 @@ module EducodeSales
 
     has_many :login_histories, dependent: :destroy
 
+    has_many :staff_school_tags, dependent: :destroy
+
     has_many :market_areas, dependent: :destroy
     has_many :areas, through: :market_areas
     validates :user_id, uniqueness: { message: '已存在' }

data/app/models/educode_sales/staff_school_tag.rb

@@ -0,0 +1,6 @@
+module EducodeSales
+  class StaffSchoolTag < ApplicationRecord
+    belongs_to :staff
+    belongs_to :school_tag
+  end
+end

data/app/views/educode_sales/businesses/index.html.erb

@@ -151,6 +151,12 @@
     <% end %>
     <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right at-btn" lay-event="followes"> 我的关注</button>
     <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right my-btn" lay-event="mine"> 我的商机</button>
+    <% if can?(:special, EducodeSales::Business) %>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right s-btn" lay-event="special">专项管理商机</button>
+   <% end %>
+   <% if can?(:area_manage, EducodeSales::Business) %>
+   <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right area-btn" lay-event="area">区域管理商机</button>
+   <% end %>
     <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right all-btn" lay-event="all"> 全部商机</button>
   </div>
 </script>
@@ -330,6 +336,9 @@
         data.business_type = business_type_list.getValue('valueStr')
         data.business_step = business_step_list.getValue('valueStr');
         data.staff_id = staff_list.getValue('valueStr');
+        <% if params[:year].present? %>
+        data.year = "<%= params[:year] %>";
+        <% end %>
 
         table = layui.table;
         var cols_table = [
@@ -723,6 +732,9 @@
             data.business_type = business_type.toString();
             data.business_step = business_step.toString();
             data.staff_id = staff_list.getValue('valueStr');
+            <% if params[:year].present? %>
+            data.year = "<%= params[:year] %>";
+            <% end %>
             layer.load(0, {});
             request.authPost("/missions/businesses/get_export_data", {
                 name: data.name,
@@ -739,10 +751,10 @@
                 date_at: data.date_at,
                 bidded_date: data.bidded_date,
                 business_year: data.business_year,
+                year: data.year,
                 mine: search['clazz'] == 'me' ? true : '',
                 is_follow: search['clazz'] == 'followes' ? true : '',
             }, function (res) {
-                console.log(res.data);
                 data = res.data
                 table.exportFile(business_table.config.id,data, type);
                 layer.closeAll('loading');
@@ -937,6 +949,9 @@
             data.field.staff_id = staff_list.getValue('valueStr');
             data.field.business_type = business_type.toString();
             data.field.business_step = business_step.toString();
+            <% if params[:year].present? %>
+            data.field.year = "<%= params[:year] %>";
+            <% end %>
              if (search['clazz']) {
               data.field['clazz'] = search['clazz']
              }
@@ -961,6 +976,10 @@
               $(".my-btn").addClass("selected-btn");
             } else if (search['clazz'] == 'followes') {
               $(".at-btn").addClass("selected-btn");
+            } else if (search['clazz'] == 'special') {
+              $(".s-btn").addClass("selected-btn");
+            } else if (search['clazz'] == 'area') {
+              $(".area-btn").addClass("selected-btn");
             } else {
               $(".all-btn").addClass("selected-btn");
             }
@@ -1083,6 +1102,40 @@
                 $(".my-btn").addClass("selected-btn");
                 return false;
             }
+            else if (obj.event === 'special') {
+                search = {"clazz": "special"}
+                business_type_list.setValue([])
+                table.reload('businesses_table', {
+                    url: '/missions/businesses',
+                    page: {
+                        curr: 1
+                    },
+                    where: {q: search, sort: sort}
+                }, 'data');
+                form.val('search_form', {
+                    name: '', department: '', staff_id: '', business_type: '', business_step: '',
+                    place_id: '', date: '', area: ''
+                })
+                $(".s-btn").addClass("selected-btn");
+                return false;
+            }
+            else if (obj.event === 'area') {
+                search = {"clazz": "area"}
+                business_type_list.setValue([])
+                table.reload('businesses_table', {
+                    url: '/missions/businesses',
+                    page: {
+                        curr: 1
+                    },
+                    where: {q: search, sort: sort}
+                }, 'data');
+                form.val('search_form', {
+                    name: '', department: '', staff_id: '', business_type: '', business_step: '',
+                    place_id: '', date: '', area: ''
+                })
+                $(".area-btn").addClass("selected-btn");
+                return false;
+            }
             else if (obj.event === 'delete') {
                 var checkStatus = table.checkStatus('currentTableId'),
                     data = checkStatus.data;

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

@@ -98,7 +98,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>现有商机<a href="/missions/businesses?name=(销售态势-<%=@year %>-现有商机)&type=1&business_year=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>现有商机<a href="/missions/businesses?name=(销售态势-<%=@year %>-现有商机)&type=1&year=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @business_amount.round(2) %>万</h1>
@@ -150,7 +150,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>A类商机<a href="/missions/businesses?type=a&business_year=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>A类商机<a href="/missions/businesses?type=a&year=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @a_amount %>万</h1>
@@ -201,7 +201,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>B类商机<a href="/missions/businesses?type=b&business_year=<%= @year %>" style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>B类商机<a href="/missions/businesses?type=b&year=<%= @year %>" style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @b_amount %>万</h1>

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

@@ -35,7 +35,15 @@
       <div class="layui-input-inline" style="">
         <div id="edit_assign_follow" style="width: 1140px;"></div>
       </div>
+    </div>
+    <% if can?(:special, EducodeSales::Business) %>
+    <div class="layui-form-item">
+      <label class="layui-form-label">专项客户类型</label>
+      <div class="layui-input-inline">
+        <div id="school_properties" style="width: 600px;"></div>
       </div>
+    </div>
+    <% end %>
     <div class="layui-form-item">
       <label class="layui-form-label required">生效日期</label>
       <div class="layui-input-block">
@@ -78,7 +86,13 @@
         laydate.render({
             elem: '#day'
         });
-
+        if (document.getElementById("school_properties")) {
+          var school_properties_list = xmSelect.render({
+            el: '#school_properties',
+            data: gon.school_properties,
+            filterable: true,
+          })
+        }
 
         var parentIndex = layer.index;
         transfer.render({
@@ -136,8 +150,15 @@
             sales_list.getValue().forEach(function(d) {
                 schools.push(d.value);
             })
+            var tag_ids = [];
+            if (document.getElementById("school_properties")) {
+              school_properties_list.getValue().forEach(function(d) {
+                tag_ids.push(d.value);
+              })
+            }
             data.field['school_ids'] = schools;
             data.field['area_ids'] = area_ids;
+            data.field['school_tag_ids'] = tag_ids;
             request.authPut("missions/staffs/" + parent.staff_id, data.field, function (res) {
                 console.log(res.success == false)
                 if (res.success == false) {

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -30,6 +30,9 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
       EducodeSales::Permission.create(name: '删除跟进记录(本人创建)', subject: 'Business', action: 'self_delete_follow', clazz: 'business', position: '10')
 
       EducodeSales::Permission.create(name: '合并商机', subject: 'Business', action: 'merge_business', clazz: 'business', position: '12')
+      EducodeSales::Permission.create(name: '专项管理商机', subject: 'Business', action: 'special', clazz: 'business', position: '13')
+      EducodeSales::Permission.create(name: '区域管理商机', subject: 'Business', action: 'area_manage', clazz: 'business', position: '14')
+      
       #回款管理权限
       EducodeSales::Permission.create(name: '查看回款列表', subject: 'MoneyPlan', action: 'read', clazz: 'money_plan', position: '15')
 

data/db/migrate/20230206080303_create_educode_sales_staff_school_tags.rb

@@ -0,0 +1,10 @@
+class CreateEducodeSalesStaffSchoolTags < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_staff_school_tags do |t|
+      t.references :staff
+      t.references :school_tag
+
+      t.timestamps
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.40'
+  VERSION = '0.9.41'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.40
+  version: 0.9.41
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-02 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -221,6 +221,7 @@ files:
 - app/models/educode_sales/sale_trend.rb
 - app/models/educode_sales/staff.rb
 - app/models/educode_sales/staff_school.rb
+- app/models/educode_sales/staff_school_tag.rb
 - app/models/educode_sales/teacher.rb
 - app/models/educode_sales/teacher_assign_follow.rb
 - app/models/educode_sales/teacher_follow.rb
@@ -489,6 +490,7 @@ files:
 - db/migrate/20221107122147_change_divide_rate_follow_ups.rb
 - db/migrate/20230115080730_add_origin_business_id_to_follow_ups.rb
 - db/migrate/20230117144025_create_educode_sales_business_clazz_changes.rb
+- db/migrate/20230206080303_create_educode_sales_staff_school_tags.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb