educode_sales 0.9.42 → 0.9.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d635995859ce768ee96b28509c5094efbc03e8d98ca1b6fe59e52bc4696ef41e
-  data.tar.gz: 8010219ab35845df3329179cf6e8f2e56e224b5d60781a2ff4b80999efcc0c1c
+  metadata.gz: e3b8eeaf96172e79bdd5ecd470826d1b1509e27aa51650992fea9573124c03a8
+  data.tar.gz: 448e73b86222666fa76163427cacf66d25dcb3afff0186dac870da2096f701ec
 SHA512:
-  metadata.gz: 3939a32d342b6ce49488569f52a67902fad404502dfae2262a1f4b37a3275ec63728e36a1d03feebba2cbf20590de4ceac237a09d5b053dc10510e5506eb20f5
-  data.tar.gz: 37ba20f22853d9cd00c82c5a1f472157fa37fbfe8cfac77cb868b707142ab6d36b8e93f1ecb4f9cd6dec9f478ed9b406cfb06a68115812b6e7dd0a3e67d40391
+  metadata.gz: d33d493129ce919f40d3ba640312a2b32b8965e269f013c9fac9cd8972576fd5cae0ce6c3099c691ff5b993263f36f61ab2f2f5298c6051c51df74c4c4d6c5dd
+  data.tar.gz: ab38c5526bec3b5eae9b4109b705298f8a5b8a2d932845bf70fc1b45b0d29ef9395b3d6865b840703bda9184b754ebc6411efee484d78160ea3b74dda998977b

data/app/controllers/educode_sales/customers_controller.rb

@@ -39,6 +39,7 @@ module EducodeSales
         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] }
+          gon.school_tags = SchoolTag.where(for_missions: true).map { |d| {value: d.id, name: d.name } }
         end
         format.json do
           if @current_admin.is_admin?
@@ -73,28 +74,34 @@ module EducodeSales
             @customers = @customers.where(id: school_ids)
           end
           if params[:q].present? && params[:q][:property].present?
-            school_property_ids = []
             property = params[:q][:property].split(",").map(&:to_i)
-            property.each do |p|
-              case p
-              when 0
-                school_property_ids += SchoolProperty.where(project_985: true).ids
-              when 1
-                school_property_ids += SchoolProperty.where(project_211: true).ids
-              when 2
-                school_property_ids += SchoolProperty.where(regular_college: true).ids
-              when 3
-                school_property_ids += SchoolProperty.where(junior_college: true).ids
-              when 4
-                school_property_ids += SchoolProperty.where(secondary_school: true).ids
-              when 5
-                school_property_ids += SchoolProperty.where(military_school: true).ids
-              when 6
-                school_property_ids += SchoolProperty.where(enterprise: true).ids
-              else
-              end
-            end
-            @customers = @customers.where(school_property_id: school_property_ids)
+            # property.each do |p|
+            #   case p
+            #   when 0
+            #     school_property_ids += SchoolProperty.where(project_985: true).ids
+            #   when 1
+            #     school_property_ids += SchoolProperty.where(project_211: true).ids
+            #   when 2
+            #     school_property_ids += SchoolProperty.where(regular_college: true).ids
+            #   when 3
+            #     school_property_ids += SchoolProperty.where(junior_college: true).ids
+            #   when 4
+            #     school_property_ids += SchoolProperty.where(secondary_school: true).ids
+            #   when 5
+            #     school_property_ids += SchoolProperty.where(military_school: true).ids
+            #   when 6
+            #     school_property_ids += SchoolProperty.where(enterprise: true).ids
+            #   when 7
+            #     school_property_ids += SchoolProperty.where(mid_school: true).ids
+            #   when 8
+            #     school_property_ids += SchoolProperty.where(ele_school: true).ids
+            #   when 9
+            #     school_property_ids += SchoolProperty.where(other: true).ids
+            #   else
+            #   end
+            # end
+            @customers = @customers.joins(:school_tags).where("school_tags.id in (?)", property).distinct
+            # @customers = @customers.where(school_property_id: school_property_ids)
           end
 
           if params[:q].present? && params[:q][:date].present?

data/app/controllers/educode_sales/staffs_controller.rb

@@ -54,7 +54,8 @@ module EducodeSales
       # 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(for_missions: true).map { |d| { value: d.id, name: d.name, selected: tag_ids.include?(d.id) } }
+      names = %w[本科院校 军事院校 高职院校 中职院校 中学 小学 企业 其他]
+      gon.school_properties = SchoolTag.where(for_missions: true).sort_by { |tag| names.index(tag.name) }.map { |d| { value: d.id, name: d.name, selected: tag_ids.include?(d.id) } }
       render layout: false
     end
 
@@ -113,7 +114,7 @@ module EducodeSales
       end
       staff.staff_permissions.delete_all
       permissions.each do |permission|
-        staff.staff_permissions.create(staff_id:staff.id, permission_id:permission.id)
+        staff.staff_permissions.create(staff_id: staff.id, permission_id: permission.id)
       end
       staff.staff_school_tags = tags
       params[:current_admin] = @current_admin.id

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

@@ -496,6 +496,7 @@
                     field: 'budget_amount',
                     width: 105,
                     title: '预算金额',
+                    totalRow: true,
                     sort: true,
                     hide: gon.filter.budget_amount
                 },

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

@@ -28,16 +28,21 @@ json.data do
     json.divide_money d.divide_amount.to_f.round(2)
     json.budget_amount d.budget_amount.to_f.round(2)  #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 = []
+    # school_property = d.department.school.school_property
+    # property = []
 
-    if school_property.present?
-      property << '本科地方院校' if school_property.regular_college || school_property.project_985 ||  school_property.project_211
-      property << '高职' if school_property.junior_college || school_property.secondary_school
-      property << '本科军校' if school_property.military_school
-      property << '企业' if school_property.enterprise
+    # if school_property.present?
+    #   property << '本科地方院校' if school_property.regular_college || school_property.project_985 ||  school_property.project_211
+    #   property << '高职' if school_property.junior_college || school_property.secondary_school
+    #   property << '本科军校' if school_property.military_school
+    #   property << '企业' if school_property.enterprise
+    # end
+    if d.department.school
+      json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+    else
+      json.property ''
     end
-    json.property property.join("、")
+    # json.property d.school.school_property.school_tags.where(for_missions: true).pluck(:name).join("、")#property.join("、")
     json.sale_way d.last_follow_up&.place&.name.present? ? '渠道' : '直销'
     json.year d.last_follow_up&.year.to_s
     json.total_amount d.last_follow_up&.total_amount.to_f.round(2)