educode_sales 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c243136aa29c06071bc7f5178e7c6eab7a7711c29a664ed12b4141b823102e1
-  data.tar.gz: db224456ae6c27346fadb5ae65b2ed6973ba11e1c384f2b833f994e6371540cb
+  metadata.gz: fd1dede8ec609b98a19dcd71c21bac7b6024098a7cdb8bad5c600784bd9a649e
+  data.tar.gz: 34bdddc9c368c11588d2d9dc0a3307f8cfbc4568489f539e344b13f32bf41702
 SHA512:
-  metadata.gz: a5df7256338dc4a0bcc7f3ef6933c573f79b186a77ba12fcb10bcbfc80a11cfb3253d57ae2ea2325346a76c089fe9c9a71751407697bb4e3706ee6b58e11abf1
-  data.tar.gz: fa152803f2738331a1324e530275b6c31ff0420f5f725c537587b754555ae6eaeb0ce4bf5e522ef81ae109224e74b65effdf4435e7cb71e88fd11d6409c42580
+  metadata.gz: 372e451790e777e0c9df20e7bdd9bc133e4d15351c6ae5b541c53a9761b14c2cbd5645c7517d0ae20ea4301872592fd43de82013ae90166546b5ae647b59db32
+  data.tar.gz: f9a5c5518474de3e1aa03e2fe1fae7bbede839df9649227e1c0c0ddba1f4aaaf62e3e903c813c3115dd7d792d56e48e9c6659226cf0ed4b29169ac1198dda8a4

data/app/controllers/educode_sales/businesses_controller.rb

@@ -206,6 +206,7 @@ module EducodeSales
             last_follow.reception_at,
             last_follow.bidded_date,
             last_follow.signed_date,
+            last_follow.year,
             last_follow.created_at as latest_time,
             last_follow.actual_amount,
             (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
@@ -370,7 +371,7 @@ module EducodeSales
           render layout: false
         end
         format.json do
-          @records = BusinessExportRecord.all.page(params[:page]).per(params[:limit])
+          @records = BusinessExportRecord.all.order(id: :desc).page(params[:page]).per(params[:limit])
         end
       end
     end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -20,7 +20,7 @@ module EducodeSales
               business_ids = @businesses.pluck(:id)
               @follow_ups = FollowUp.where(business_id: business_ids)
             when '区域'
-              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+              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)
               business_ids = @businesses.pluck(:id)

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -21,11 +21,11 @@ module EducodeSales
             when '自己'
               @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.id)
             when '区域'
-              a_ids = MoneyPlan.where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.id).ids
+              a_ids = MoneyPlan.where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.id).pluck(:follow_up_id)
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
               b_ids = Business.where(school_id: school_ids).pluck(:last_follow_up_id)
               ids = a_ids + b_ids
-              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(id: ids)
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: ids)
             else
               @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids)
             end

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -20,8 +20,11 @@ module EducodeSales
             when '自己'
               @sale_plans = OperationPlan.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?) OR schools.id in (?)", @current_admin.areas.pluck(:name), StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)).pluck(:id)
-              @sale_plans = OperationPlan.where("staff_id in (?) OR educode_sales_operation_plans.staff_id = ?", staff_ids, @current_admin.id)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
+              school_ids = StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
+              department_ids = Department.where(school_id: school_ids).pluck(:id)
+              teacher_ids = Teacher.where(department_id: department_ids).pluck(:id)
+              @sale_plans = OperationPlan.where("staff_id in (?) OR educode_sales_operation_plans.staff_id = ? OR educode_sales_operation_plans.teacher_id in (?)", staff_ids, @current_admin.id,teacher_ids)
             else
               @sale_plans = OperationPlan
             end

data/app/controllers/educode_sales/plans_controller.rb

@@ -21,8 +21,9 @@ module EducodeSales
             when '自己'
               @sale_plans = SalePlan.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?) OR schools.id in (?)", @current_admin.areas.pluck(:name),StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)).pluck(:id)
-              @sale_plans = SalePlan.where("staff_id in (?) OR educode_sales_sale_plans.staff_id = ?", staff_ids, @current_admin.id)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
+              business_ids = Business.where(school_id: StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)).pluck(:id)
+              @sale_plans = SalePlan.where("staff_id in (?) OR educode_sales_sale_plans.staff_id = ? OR educode_sales_sale_plans.business_id in (?)", staff_ids, @current_admin.id,business_ids)
             else
               @sale_plans = SalePlan
             end

data/app/controllers/educode_sales/staffs_controller.rb

@@ -86,6 +86,8 @@ module EducodeSales
         params[:school_ids].each do |d|
           staff.staff_schools.create(school_id: d)
         end
+      else
+        staff.staff_schools.destroy_all
       end
       if staff.save
         render_success

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

@@ -368,6 +368,7 @@
                 field: 'year',
                 width: 105,
                 title: '所属年度',
+                  sort: true
               },
               {
                 title: '操作',

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

@@ -196,9 +196,15 @@
 
               {
                 field: 'place',
-                width: 400,
+                width: 120,
                 title: '渠道',
               },
+              {
+                field: 'year',
+                width: 120,
+                title: '所属年度',
+                  sort: true
+              },
               {
                 title: '操作',
                 minWidth: 200,

data/app/views/educode_sales/businesses/show_follow.json.jbuilder

@@ -19,6 +19,7 @@ json.data do
     json.is_latest d.id == @latest&.id
     json.flag d.created_at.present? ? (Time.now - d.created_at).to_f/3600 < 24 : false
     json.description d.description
+    json.year d.year
     json.self_flag d.staff_id == @current_admin.id
   end
 end

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

@@ -140,7 +140,7 @@
                     {
                         field: 'name',
                         title: '客户名称',
-                        width: 100,
+                        width: 150,
                         templet: "#name"
                     },
                     {
@@ -150,7 +150,6 @@
                     },
                     {
                         field: 'property',
-                        width: 200,
                         title: '性质',
                     },
                     {

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

@@ -37,7 +37,7 @@
           </div>
         </div>
         <div class="layui-form-item" style="border-top: 1px solid #ddd;">
-          <label class="layui-form-label">回款管理</label>
+          <label class="layui-form-label">回款计划</label>
           <div class="layui-input-block">
             <%= radio_button_tag("money_plan", "自己", @areas.include?("回款管理-自己"), {title: '本人负责列表', id: 16}) %>
             <%= radio_button_tag("money_plan", "区域", @areas.include?("回款管理-区域"), {title: '本人负责区域及监管院校列表', id: 17}) %>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails