educode_sales 0.9.43 → 0.9.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 392c1371a9b0cb569b25de476461924555a2d8b077a2864f1bc33145ae65bc61
-  data.tar.gz: 250898b5906ea9b92a41eb4bef8b9ecba8e254bcd574d37d4cdc8cdd11f25811
+  metadata.gz: 490547dd6002957fc97b49d5944e48b43476036a6f9090689c457ebdf0ad2167
+  data.tar.gz: e82a58a5dfdc42d2ad607f6c702a643ed3a91227a42771fdada0034b823340e9
 SHA512:
-  metadata.gz: b66b2ee6d89ef9f63bd035843df5c6724bb34108320dbd9c2af6d3706ccc91e5a3af9940bd22eca06779e2f6ecebeb9e816beea8fb78c967cfb620666e45df9d
-  data.tar.gz: 2d0f88851293f938355a04ed9c8c90dceaf126dd8df3b4cd8a18c675dbd158203132dbd9e3f504c2803c25c4bb3fc57c0086372871bd3b193fc4f3ddc55cba08
+  metadata.gz: 42827e0c0a5c605af5bd4ecd2dd4dd82faed892a6697d3c8c684c6d4dd4a3c96e9c67e94e7fe20eedd68c6545dad6ab5a8e66b02f39a3f2048fa8afa0b994f0c
+  data.tar.gz: 25005c073e6b4f7bf406d6950907a3fe2a95fb68a14d45ade420a663a31d29795292e168614e61501f48c08e53d8b888ba72adac3fffb05bd299b0121d7a7237

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,34 +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
-              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.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?
@@ -127,7 +128,11 @@ module EducodeSales
             @customers = @customers.where(id: school_ids)
           end
 
-          @customers = @customers.order(id: :desc).page(params[:page]).per(params[:limit])
+          if params[:page].present?
+            @customers = @customers.order(id: :desc).page(params[:page]).per(params[:limit])
+          else
+            @customers = @customers.order(id: :desc)
+          end
         end
       end
     end
@@ -212,6 +217,36 @@ module EducodeSales
       render layout: false
     end
 
+    def batch_update_school_tags
+      xlsx = Roo::Spreadsheet.open(params[:file])
+      ods = xlsx.sheet(0)
+      rows = ods.last_row - 1
+      i = 0
+      school_tag_hash = SchoolTag.where(for_missions: true).pluck(:name, :id).to_h
+      rows.times do |r|  #行数
+        i += 1
+        next unless ods.row(r+1)[0]
+        school = School.find_by(name: ods.row(r+1)[0].to_s.strip)
+        school_list = EducodeSales::CustomerAdd::SCHOOL_LIST.invert
+        if school
+          property_names = ods.row(r+1)[2].to_s.strip
+          tags = []
+          if property_names
+            property_names.gsub("、", " ").gsub(",", " ").split(" ").each do |tag|
+              if school_tag_hash[tag]
+                tags << SchoolTagMiddle.find_or_initialize_by(school_id: school.id, school_tag_id: school_tag_hash[tag])
+              end
+            end
+          end
+          school.school_tag_middles = tags
+        end
+      end
+
+      SchoolTagMiddle.where(school_id: nil).delete_all
+      
+      render json: { succcess: true}
+    end
+
     def update
       @school = School.find(params[:id])
       ActiveRecord::Base.transaction do
@@ -235,20 +270,11 @@ module EducodeSales
         #保存学校标签
 
         keys = %w[regular_college junior_college secondary_school military_school other mid_school ele_school enterprise]
-        names = {
-          "regular_college" => "本科院校",
-          "junior_college" => "高职院校",
-          "secondary_school" => "中职院校",
-          "military_school" => "军事院校",
-          "other" => "其他",
-          "mid_school" => "中学",
-          "ele_school" => "小学",
-          "enterprise" => "企业"
-        }
+        names = EducodeSales::CustomerAdd::SCHOOL_LIST
         property.attributes.each do |key, value|
           next unless key.in?(keys)
           next unless value.to_s == "true"
-          school_tag = SchoolTag.find_by_name(names[key])
+          school_tag = SchoolTag.find_by(name: names[key], for_missions: true)
           if school_tag.present?
             SchoolTagMiddle.create(school_id: @school.id, school_tag_id: school_tag.id)
           end

data/app/models/educode_sales/customer_add.rb

@@ -1,4 +1,15 @@
 module EducodeSales
   class CustomerAdd < ApplicationRecord
+
+    SCHOOL_LIST = {
+      "regular_college" => "本科院校",
+      "junior_college" => "高职院校",
+      "secondary_school" => "中职院校",
+      "military_school" => "军事院校",
+      "other" => "其他",
+      "mid_school" => "中学",
+      "ele_school" => "小学",
+      "enterprise" => "企业"
+    }
   end
 end

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)