educode_sales 0.9.93 → 0.9.94

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51508cb445eacf64d62d59e0f437507abf2d9e5434f53a36096afe63b28f08e0
-  data.tar.gz: 06d6f1f375007355722c3ece45f56c509891dda30f3426c09a7c0d2d2cbbcf0e
+  metadata.gz: 9b7b6e63bd6432ce355c059bed56cd08ec327575c300211edfdd7456b47f803e
+  data.tar.gz: 425005691f9b2a971c971468428dc4f4f48e269adba413531e0eafb3e744abcc
 SHA512:
-  metadata.gz: 6b5990a12fffd0ffee4f15cb36285b260fafa8e20a99823459a53267eedb8277c8747bcd8a9a6d98d9845845b87ec8893b2b4986d0cd665ed47f8b314758a861
-  data.tar.gz: d38671efcd59171eb66ac920c045e46c0a4bf97f6117cc9b8fd3e714a8640a76729d6374c4c2292769a526cec6a614df51bb0c90795d7b40e1e97b525599e5b0
+  metadata.gz: ef43f0359464d39687502f0e5ba43c01855f5c9d9a6c53dc5a360a0ea79d8cb2b916d103e0d99519ff491cd4deb7a2ac9456b2a250b0bcf6c0d884b643168c8e
+  data.tar.gz: 4397b3bef68f798255cccac646cb30f706d0161daa8596f55891b261c0ddd4b93c81c5b4f2b2966856ca970607e02bb6d7a8ba80f4237447967c905eb425b65f

data/app/controllers/educode_sales/customers_controller.rb

@@ -166,7 +166,7 @@ module EducodeSales
       respond_to do |format|
         format.html do
           common = Common.find_by(clazz: 'staff_type', name: '销售')
-          @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
+          @staffs = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
           gon.school_tags = SchoolTag.where(for_missions: true).map { |d| {value: d.id, name: d.name } }
         end
         format.json do
@@ -199,7 +199,9 @@ module EducodeSales
             schools.*,
             s.major_count,
             s.department_id,
-            departments.name AS department_name
+            departments.name AS department_name,
+            (SELECT COUNT(user_extensions.id) FROM user_extensions WHERE user_extensions.department_id = s.department_id AND user_extensions.identity = 0) AS teacher_count,
+            (SELECT COUNT(user_extensions.id) FROM user_extensions WHERE user_extensions.department_id = s.department_id AND user_extensions.identity = 1) AS student_count
           ").joins("
             JOIN schools ON s.id = schools.id
             LEFT JOIN departments ON s.department_id = departments.id

data/app/views/educode_sales/customers/list.json.jbuilder

@@ -1,16 +1,28 @@
 x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
 o = EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
+business_ids_group_a = EducodeSales::Business.where(department_id: @customers.map(&:department_id)).group_by(&:department_id)
+business_ids_group_b = EducodeSales::Business.where(school_id: @customers.map(&:id)).group_by(&:school_id)
+all_follow_ups = EducodeSales::FollowUp.where(business_id: business_ids_group_a.values.flatten.map(&:id) + business_ids_group_b.values.flatten.map(&:id))
+customer_follows_a = EducodeSales::CustomerFollow.where(department_id: @customers.map(&:department_id)).group_by(&:department_id)
+customer_follows_b = EducodeSales::CustomerFollow.where(school_id: @customers.map(&:id)).group_by(&:school_id)
+all_school_tags = SchoolTag.joins(:school_tag_middles).where(school_tag_middles: { school_id: @customers.map(&:id) }).select(:school_id, :name, :for_missions)
+business_count_group_a = EducodeSales::Business.where(department_id: @customers.map(&:department_id)).group(:department_id).count
+business_count_group_b = EducodeSales::Business.where(school_id: @customers.map(&:id)).group(:school_id).count
+o_business_count_group_a = EducodeSales::Business.where(department_id: @customers.map(&:department_id)).where("educode_sales_businesses.clazz_id = ?", o).group(:department_id).count
+o_business_count_group_b = EducodeSales::Business.where(school_id: @customers.map(&:id)).where("educode_sales_businesses.clazz_id = ?", o).group(:school_id).count
+all_staffs_group = EducodeSales::CustomerExtension.where(school_id: @customers.map(&:id)).includes(customer_staff: :user).group_by(&:school_id)
+
 json.data do
   json.array! @customers do |d|
     if d['department_id']
-      business_ids = EducodeSales::Business.where(department_id: d['department_id']).ids
-      customer_follows = EducodeSales::CustomerFollow.where(department_id: d['department_id'])
+      business_ids = business_ids_group_a[d['department_id']]&.map(&:id) || []
+      customer_follows = customer_follows_a[d['department_id']] || []
     else
-      business_ids = EducodeSales::Business.where(school_id: d.id).ids
-      customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
+      business_ids = business_ids_group_b[d.id]&.map(&:id) || []
+      customer_follows = customer_follows_b[d.id] || []
     end
-    follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
-    
+    follow_ups = all_follow_ups.select { |f| business_ids&.include?(f.business_id) }
+
     a_last_follow_time = follow_ups.last&.created_at&.to_s
     b_last_follow_time = customer_follows.last&.created_at&.to_s
     if a_last_follow_time.present? && b_last_follow_time.present?
@@ -21,24 +33,23 @@ json.data do
     json.id d.id
     json.name d.name
     json.area d.province
-    json.property d.school_tags.where(for_missions: true).pluck(:name).join("、")
+    json.property all_school_tags.select { |t| t.school_id == d.id && t.for_missions? }.pluck(:name).join("、")
     if d['department_id']
-      json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.department_id = ?", d['department_id']).size
-      json.o_business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id = ?", o).where("educode_sales_businesses.department_id = ?", d['department_id']).size
+      json.business business_count_group_a[d['department_id']] || 0
+      json.o_business o_business_count_group_a[d['department_id']] || 0
     else
-      json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.school_id = ?", d.id).size
-      json.o_business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id = ?", o).where("educode_sales_businesses.school_id = ?", d.id).size
+      json.business business_count_group_b[d.id] || 0
+      json.o_business o_business_count_group_b[d.id] || 0
     end
     json.unit "#{d.name}---#{d['department_name']}"
-   
-    # json.follow follow_ups.size + customer_follows.size
+
     json.follow customer_follows.size
-    json.staff EducodeSales::CustomerExtension.where(school_id: d.id).map { |d| d.customer_staff&.user&.real_name }.join("、")
+    json.staff all_staffs_group[d.id]&.map { |d| d.customer_staff&.user&.real_name }&.join("、")
     json.department d['department_name'] || ''
     json.major_count d['major_count']
     json.department_id d['department_id'] || ''
-    json.teacher_counts UserExtension.where(department_id: d.department_id, identity: 'teacher').size
-    json.student_counts UserExtension.where(department_id: d.department_id, identity: 'student').size
+    json.teacher_counts d['teacher_count']
+    json.student_counts d['student_count']
   end
 end
 

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.93'
+  VERSION = '0.9.94'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.93
+  version: 0.9.94
 platform: ruby
 authors:
 - anke1460