educode_sales 0.9.21 → 0.9.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a49e1fe26099afa0e25a1542fe775e0433f635c3573e4f05c6ea6f3668446d5
-  data.tar.gz: 9a461d3ec11c8edf2e6a2a0ff5af5935e97e49f7604203cdaf1bdcc3f5e22ad8
+  metadata.gz: c58fda9ebef8022559880649de7e90de9c0b5537ccab09a2bdf1900bea0373a1
+  data.tar.gz: cea666fa1f5c0939b3ad387cf023faf9a27169495d607ce32918208c0562f326
 SHA512:
-  metadata.gz: 535bb72b0065d1fab5ebc6e7aef7d439f8ebdc6511ad9b15fbaf464404c043d937ccb6155e171f935d5e08b5431514e1aeb2f068e96736704616a5b0c06f9ca6
-  data.tar.gz: 8b31c2724ce9fe79f94cd1f8a0ce91045b0833ec2524476037827587fbc708c7507886c46b76511885c425906de6c84cc1219c1b965d68d3413a01a59db32912
+  metadata.gz: '0905e5bc74bb514316f7e053e54768ae633f42591929d627033acab86bdc180ad7c660b1df276104be4f99fda43d9d21f37c58170b973a22e65e9285077e681a'
+  data.tar.gz: 489498f262416a5a5ce3eed6327796116d705299eac68a08600d0ab6b2a3bfcfbe708214a921c3aa7cc6f1cf383ea11f7d69df774d7a3581d4ce6db97150f43b

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -102,6 +102,7 @@ module EducodeSales
         @business.update(last_follow_up_id: follow_up.id)
         # 增加o商机编号
         add_business_number
+        update_department
         render_success
       else
         render_failure follow_up
@@ -140,6 +141,7 @@ module EducodeSales
         # 增加o类商机
         @business = follow_up.business
         add_business_number
+        update_department
         render_success
       else
         render_failure follow_up
@@ -258,6 +260,21 @@ module EducodeSales
       params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :divide_rate, :budget_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment)
     end
 
+    # 更新部门和部门下老师用户的状态
+    def update_department
+      clazz = %w[已中标 已签单 已验收 回款中 服务中]
+      name = @business.last_follow_up&.stage&.name
+      Rails.logger.debug("调试======#{clazz.include?(name)}")
+      if clazz.include?(name)
+        department = @business.department
+        if department
+          department.level = 2
+          department.save!
+          UserExtension.where(department_id:@business.department_id,identity:0).update_all(level:2)
+        end
+      end
+    end
+
     def teacher_params
       params.permit(:professional_title, :job, :attitude_id, :sex, :birth_date, :remark, :tel)
     end

data/app/controllers/educode_sales/staffs_controller.rb

@@ -2,7 +2,6 @@ require_dependency "educode_sales/application_controller"
 
 module EducodeSales
   class StaffsController < ApplicationController
-
     def index
       respond_to do |format|
         format.html do
@@ -35,7 +34,9 @@ module EducodeSales
     def create
       user = User.find(params[:id])
       staff = Staff.new(user_id: user.id)
+      params[:current_admin] = @current_admin.id
       if staff.save
+        impressionist(staff, params)
         render_success
       else
         render_failure staff
@@ -60,6 +61,8 @@ module EducodeSales
 
     def destroy
       staff = Staff.find(params[:id])
+      params[:current_admin] = @current_admin.id
+      impressionist(staff, params)
       staff.update(deleted_at: Time.now, expired_at: Time.now.days_ago(1))
       render_success
     # rescue ActiveRecord::DeleteRestrictionError => e
@@ -68,6 +71,8 @@ module EducodeSales
 
     def disable
       staff = Staff.find(params[:id])
+      params[:current_admin] = @current_admin.id
+      impressionist(staff, params)
       staff.update(expired_at: Time.now.days_ago(1))
       render_success
     end
@@ -89,6 +94,8 @@ module EducodeSales
       else
         staff.staff_schools.destroy_all
       end
+      params[:current_admin] = @current_admin.id
+      impressionist(staff, params)
       if staff.save
         render_success
       else

data/app/models/educode_sales/staff.rb

@@ -3,6 +3,8 @@ module EducodeSales
     belongs_to :user
     belongs_to :role, optional: true
 
+    is_impressionable
+
     has_many :follow_ups, dependent: :destroy
     has_many :operation_plans, dependent: :destroy
     has_many :operation_reports, dependent: :destroy

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

@@ -26,7 +26,7 @@ json.data do
 
     json.divide_rate d.divide_rate
     json.divide_money d.divide_amount
-    json.budget_money d.budget_amount
+    json.budget_amount d.budget_amount
     json.area d.department.school.province
     school_property = d.department.school.school_property
     property = []

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

@@ -404,11 +404,11 @@
                     hide: gon.filter.o_business_deployment
                 },
                 {
-                    field: 'budget_money',
+                    field: 'budget_amount',
                     width: 105,
                     title: '预算金额',
                     sort: true,
-                    hide: gon.filter.budget_money
+                    hide: gon.filter.budget_amount
                 },
                 {
                     field: 'total_amount',

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

@@ -28,7 +28,7 @@ json.data do
     end
     json.divide_rate d.divide_rate
     json.divide_money d.divide_amount
-    json.budget_money d.budget_amount #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0
+    json.budget_amount d.budget_amount #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0
     json.area d.department.school.province
     school_property = d.department.school.school_property
     property = []

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.21'
+  VERSION = '0.9.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.21
+  version: 0.9.23
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2022-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ 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
@@ -488,7 +489,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -503,8 +504,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []