educode_sales 0.9.57 → 0.9.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 818fb31794a0b8bd388742d852aacf2e35c054515c7cf7cfd1147c988113f2f9
-  data.tar.gz: db3afee84373a8f61e36b12ed6ab3b3d926ff1f6220b3b650d0fa53921386221
+  metadata.gz: c6655d618fcde94017c9a83078d6dd9600cb78cdc6bac13ecc4a7d75b8276edb
+  data.tar.gz: cf339c058e8f173855bacea9e9e8c81c641e2a616fc0633831b0277eeab30a4a
 SHA512:
-  metadata.gz: f981b156b309f02188799237054323f548149d4f8154542be0cc1153aaca4c671d19ee4322d487d1bd0abd4cb22236df3bbda48d781dd22c16c9355c3c14766a
-  data.tar.gz: f2867f60c9c7ece3a251ca9b13ae063c3cada9364a9789d4b23872d8cf0983c643b411b1fa11a8f8f585a8c5555bd7d353d7f1b6ed78cdea8e022c8fc0e73da5
+  metadata.gz: cc5367e14159d73312f6dbc144297cd6c3c9c91bb2b409e8aa02056b0473cd85b8c2a34f7ba15535c7073ac2d019e2a055448fe43336768276fd19b2ec71f4c0
+  data.tar.gz: b0204185249ada0fa4242f330dc0815a77e50e28d0221d28382660b1623b07b503f57c879200c5d1ce96cfc68d6987a016fbad3a54d15d6c315e0b24d3736ed7

data/app/controllers/educode_sales/businesses_controller.rb

@@ -55,11 +55,11 @@ module EducodeSales
             {value: d.id, name: d.name, selected: bussiness_type.include?(d.extras)}
           end
 
-          gon.business_step = Common.where(clazz: 'business_step', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).order("position").map do |d|
-            {value: d.id, name: d.name, selected: business_step.include?(d.name)}
-          end
+          # gon.business_step = Common.where(clazz: 'business_step', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).order("position").map do |d|
+          #   {value: d.id, name: d.name, selected: business_step.include?(d.name)}
+          # end
 
-          gon.contract_business_step = Common.where(clazz: 'business_step').order("position").map do |d|
+          gon.business_step = Common.where(clazz: 'business_step').order("position").map do |d|
             {value: d.id, name: d.name, selected: business_step.include?(d.name)}
           end
 
@@ -115,7 +115,7 @@ module EducodeSales
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id) - other_staff_school_id
               @businesses = Business.joins("JOIN departments  AS dp ON educode_sales_businesses.department_id = dp.id").where("dp.school_id in (?)", school_ids)
             elsif params[:q][:clazz] == 'delete_list'
-              @businesses = Business.unscoped.where.not(deleted_at: nil)
+              @businesses = Business.unscoped.where(state_id: [1, 3])
             end
           else
             if @current_admin.is_admin?
@@ -187,7 +187,7 @@ module EducodeSales
             ").where("educode_sales_follow_ups.staff_id = ?", params[:q][:staff_id]).ids
             business_ids = part_a_ids + part_b_ids
             if params[:q][:clazz] == 'delete_list'
-              @businesses = EducodeSales::Business.unscoped.where(id:business_ids)
+              @businesses = EducodeSales::Business.unscoped.where(id:business_ids).where(state_id: [1,3])
             else
               @businesses = EducodeSales::Business.where(id:business_ids)
             end
@@ -400,12 +400,48 @@ module EducodeSales
 
     def destroy
       business = Business.find(params[:id])
-      business.soft_destroy(@current_admin.id)
-      render_success
+      if ['a_class', 'b_class'].include?(business.clazz&.extras)
+        if params[:content].present?
+          business.update(deleted_at: Time.now, state_id: 1, delete_reason: params[:content])
+          business.sale_plans.update_all(deleted_at: Time.now)
+          business.follow_ups.update_all(deleted_at: Time.now)
+        else
+          render_failure '请输入删除商机原因'
+        end
+      else
+        business.soft_destroy(@current_admin.id)
+        render_success
+      end
+     
     rescue ActiveRecord::DeleteRestrictionError => e
       render_failure '该商机已其它关联数据产生，暂不能删除'
     end
 
+    def audit
+      business = Business.unscoped.find(params[:id])
+      if params[:clazz] == 'destroy'
+        if params[:op] == 'pass'
+          business.update(state_id: 2)
+          business.sale_plans.each do |d|
+            EducodeSales::Recycle.create(source: d, deleter_id: @current_admin.id)
+          end
+          EducodeSales::Recycle.create(source: business, deleter_id: @current_admin.id)
+        else
+          business.update(state_id: 0, delete_reason: '', deleted_at: nil)
+          SalePlan.unscoped.where(business_id: business.id).update_all(deleted_at: nil)
+          FollowUp.unscoped.where(business_id: business.id).update_all(deleted_at: nil)
+        end
+      else
+        if params[:op] == 'pass'
+          business.update(state_id: 0)
+        else
+          business.clazz_id = EducodeSales::Common.find_by(extras: 'a_class').id
+          business.update(state_id: 0)
+        end
+      end
+      render_success
+    end
+
     def show_keys
       render layout: false
     end
@@ -763,6 +799,287 @@ module EducodeSales
       @business = @business.where("educode_sales_businesses.name like ?", "%#{params[:q]}%").limit(30) if params[:q].present?
     end
 
+    def contract
+      authorize! :contract_business, Business
+      respond_to do |format|
+        format.html do
+          common = Common.find_by(clazz: 'staff_type', name: '销售')
+          @staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11).map { |d| [d.user.real_name, d.id]}
+          gon.staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11).map { |d| {name: d.user.real_name, value: d.id } }
+          @more = true
+          gon.menus = []
+          gon.export_menus = []
+          gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
+
+          bussiness_type = []
+          if params[:type]
+            # 项目类型
+            bussiness_type = EducodeSales::Business.include_types(params[:type]) || []
+          end
+
+          business_step = []
+          if params[:step]
+            # 项目阶段
+            business_step = EducodeSales::Business.include_steps(params[:step]) || []
+          end
+
+          if params[:business_year].present? && params[:business_year] != '全部'
+            gon.business_year = params[:business_year]
+          end
+
+          if params[:bidded_date_year].present? && params[:bidded_date_year] != '全部'
+            if params[:step] == '应收款'
+              gon.bidded_date = "2015-01-01" + " - " + Time.new(params[:bidded_date_year]).end_of_year.strftime("%Y-%m-%d")
+            else
+              gon.bidded_date = Time.new(params[:bidded_date_year]).strftime("%Y-%m-%d") + " - " + Time.new(params[:bidded_date_year]).end_of_year.strftime("%Y-%m-%d")
+            end
+          end
+
+          if params[:signed_date_year].present? && params[:signed_date_year] != '全部'
+            gon.signed_date = Time.new(params[:signed_date_year]).strftime("%Y-%m-%d") + " - " + Time.new(params[:signed_date_year]).end_of_year.strftime("%Y-%m-%d")
+          end
+
+          if params[:date_at].present? && params[:date_at] != '全部'
+            # 回款时间
+            gon.date_at = Time.new(params[:date_at]).strftime("%Y-%m-%d") + " - " + Time.new(params[:date_at]).end_of_year.strftime("%Y-%m-%d")
+          end
+
+          gon.business_type = Common.where(clazz: 'business_type').map do |d|
+            {value: d.id, name: d.name, selected: bussiness_type.include?(d.extras)}
+          end
+
+          gon.business_step = Common.where(clazz: 'business_step', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).order("position").map do |d|
+            {value: d.id, name: d.name, selected: business_step.include?(d.name)}
+          end
+    
+          filter = Filter.find_or_create_by(staff_id: @current_admin.id, clazz: "businesses_list")
+          if filter.extras.present?
+            if filter.extras['area'].nil?
+              filter.extras['area'] = 1
+              filter.extras['property'] = 1
+              filter.extras['sale_way'] = 1
+            end
+            filter.save
+            gon.filter = filter.extras
+          else
+            gon.filter = {'area': 1, 'property': 1, 'sale_way': 1}
+          end
+        end
+        format.json do
+          if @current_admin.is_admin?
+            @businesses = Business
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
+            case level
+            when '自己'
+              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.where("educode_sales_businesses.staff_id = ? OR educode_sales_businesses.id in (?)", @current_admin.id, business_ids)
+            when '区域'
+              # 查看区域商机，需要排除掉其它人员手上的监管学校
+              other_staff_school_id = EducodeSales::StaffSchool.where.not(staff_id: @current_admin.id).where("school_id IN (SELECT school_id FROM educode_sales_staff_schools WHERE staff_id = #{@current_admin.id}) IS NOT TRUE").distinct.pluck :school_id
+
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id) - other_staff_school_id
+              if can?(:special, EducodeSales::Business)
+              # 专项商机
+                school_tag_ids = @current_admin.staff_school_tags.pluck(:school_tag_id)
+                tag_school_ids = SchoolTagMiddle.where(school_tag_id: school_tag_ids).pluck(:school_id)
+                school_ids += tag_school_ids
+              end
+              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)
+            else
+              @businesses = Business
+            end
+          end
+          if params[:q].present? && params[:q][:name].present?
+            @year = params[:q][:name].split("-")[1].present? ? params[:q][:name].split("-")[1] : ''
+          end
+
+          # @budget_stage_ids = Common.where(clazz: '商机阶段', name: ['初步接洽', '准备方案','已交方案', '已立项']).pluck(:id)
+          if params[:q] && params[:q][:signed_date].present?
+            date = params[:q][:signed_date].split(" - ")
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?", date[0], date[1])
+          end
+
+          if params[:q]&& params[:q][:date_at].present?
+            date = params[:q][:date_at].split(" - ")
+            x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
+            @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).where.not("educode_sales_money_plans.clazz!= 1").where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", date[0] + " 00:00:00", date[1] + " 23:59:59").distinct
+          end
+
+          if params[:q] && params[:q][:bidded_date].present?
+            date = params[:q][:bidded_date].split(" - ")
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", date[0], date[1])
+          end
+
+          if params[:q].present? && params[:q][:all].present?
+            @businesses = @businesses
+          end
+
+          if params[:q].present? && params[:q][:name].present?
+            @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
+          end
+          if params[:q].present? && params[:q][:department].present?
+            departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:q][:department]}%").pluck(:id)
+            @businesses = @businesses.joins(:department).where("departments.id in (?)", departments_ids)
+          end
+          if params[:q].present? && params[:q][:staff_id].present?
+            part_a_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is null AND educode_sales_businesses.staff_id = ?",params[:q][:staff_id]).ids
+            part_b_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is not null").joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.staff_id = ?", params[:q][:staff_id]).ids
+            business_ids = part_a_ids + part_b_ids
+            if params[:q][:clazz] == 'delete_list'
+              @businesses = EducodeSales::Business.unscoped.where(id:business_ids)
+            else
+              @businesses = EducodeSales::Business.where(id:business_ids)
+            end
+          end
+          if params[:q].present? && params[:q][:business_type].present?
+            @businesses = @businesses.where("educode_sales_businesses.clazz_id in (?)", params[:q][:business_type].split(",").map(&:to_i))
+          end
+          if params[:q].present? && params[:q][:contract].present?
+            contract_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id in (?)", contract_ids)
+          end
+          if params[:q].present? && params[:q][:business_step].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.stage_id in (?)", params[:q][:business_step].split(",").map(&:to_i))
+          end
+          if params[:q].present? && params[:q][:place_id].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.place_id = ?", params[:q][:place_id])
+          end
+          if params[:q].present? && params[:q][:business_year].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.year = ?", params[:q][:business_year])
+          end
+
+          if params[:q].present? && params[:q][:year].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.year <= ?", params[:q][:year])
+          end
+
+          if params[:q].present? && params[:q][:o_business_deployment].present?
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.o_business_deployment = ?", params[:q][:o_business_deployment])
+          end
+
+          if params[:q].present? && params[:q][:area].present?
+            p = EducodeSales::Common.find(params[:q][:area]).name
+            if @current_admin.is_admin?
+              @businesses = @businesses.joins("
+              JOIN departments ON educode_sales_businesses.department_id = departments.id
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+            else
+              level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
+              if level == "区域"
+                @businesses = @businesses.joins("
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+              else
+                @businesses = @businesses.joins("
+              JOIN departments ON educode_sales_businesses.department_id = departments.id
+              JOIN schools ON departments.school_id = schools.id
+            ").where("province = ?", p)
+              end
+            end
+          end
+
+          if params[:q].present? && params[:q][:date].present?
+            date = params[:q][:date].split(" - ")
+            @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1] + '23:59:59')
+          end
+
+          if params[:q].present? && params[:q][:invitation_at].present?
+            date = params[:q][:invitation_at].split(" - ")
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.invitation_at > ? AND educode_sales_follow_ups.invitation_at < ?", date[0] + '00:00:00', date[1] + '23:59:59')
+          end
+
+          # 根据编号获取商机
+          if params[:q].present? && params[:q][:number].present?
+            @businesses = @businesses.where("number like :data",  data: "%#{params[:q][:number].strip}%")
+          end
+
+          if params[:q].present? && params[:q][:clazz].present?
+            # 我的关注
+            if params[:q][:clazz] == 'followes'
+              my_ids = BusinessRelationShip.where(user_id:@current_admin.user_id).pluck(:business_id)
+              @businesses = @businesses.where(id: my_ids)
+            elsif params[:q][:clazz] == 'me'
+              ids = AssignFollowUp.joins("JOIN educode_sales_follow_ups ON educode_sales_follow_ups.id = educode_sales_assign_follow_ups.follow_up_id").where(staff_id: @current_admin.id).pluck(:business_id)
+              @businesses = @businesses.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids, @current_admin.id)
+            end
+          end
+
+          # 商机变化
+          if params[:q][:clazz_changes].present?
+            clazz_changes = EducodeSales::BusinessClazzChange.clazz_changes_value[params[:q][:clazz_changes].to_s]
+            @businesses = @businesses.joins("JOIN educode_sales_business_clazz_changes ON educode_sales_business_clazz_changes.business_id = educode_sales_businesses.id").where("educode_sales_business_clazz_changes.clazz_changed in (?)", clazz_changes)
+          end
+
+          if params[:sort].present? && params[:sort][:field]
+            if params[:sort][:field] == "service_end_time"
+              @businesses = @businesses.order("service_time_long #{params[:sort][:order]}")
+            else
+              @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+            end
+          else
+            @businesses = @businesses.order("educode_sales_businesses.created_at desc")
+          end
+
+          @business_count = @businesses.distinct.count
+          # mysql -select
+          @businesses = @businesses.select("
+            distinct
+            educode_sales_businesses.*,
+            last_follow.invitation_at,
+            last_follow.budget_amount,
+            last_follow.o_business_deployment,
+            last_follow.service_time_long,
+            last_follow.service_end_time,
+            last_follow.service_start_time,
+            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.divide_rate,
+            last_follow.divide_amount,
+            (last_follow.total_amount - last_follow.actual_amount) as divide_money,
+            (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
+            last_follow.total_amount,
+            total_follow_ups.follow_ups_counts
+            ").joins("
+            LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id AND last_follow.deleted_at IS NULL
+            LEFT JOIN (
+              SELECT COUNT(*) AS follow_ups_counts, educode_sales_follow_ups.business_id
+              FROM educode_sales_follow_ups
+              WHERE educode_sales_follow_ups.deleted_at IS NULL
+              GROUP BY educode_sales_follow_ups.business_id
+            ) AS total_follow_ups ON educode_sales_businesses.id = total_follow_ups.business_id
+          ").includes(:users, last_follow_up: [:clazz, :assign_follow_ups]).page(params[:page]).per(params[:limit])
+
+        end
+
+      end
+    end
+
     private
 
     def load_business

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -87,6 +87,9 @@ module EducodeSales
       if @business.clazz.present?
         follow_up.clazz_changed = @business.clazz_id != follow_up.clazz_id
         if follow_up.clazz_changed 
+          if @business.clazz.extras == 'a_class'
+            @business.state_id = 3
+          end
           clazz_changes = "#{@business.clazz.extras.split('_')[0]}-#{follow_up.clazz.extras.split('_')[0]}"
           business_clazz_change = EducodeSales::BusinessClazzChange.find_or_initialize_by(business_id: @business.id, clazz_changed: clazz_changes)
           business_clazz_change.save unless business_clazz_change.persisted?

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -103,6 +103,10 @@ module EducodeSales
         # end
       end
 
+      if params[:q].present? && params[:q][:attitude_id].present?
+        @follow_ups = @follow_ups.where("educode_sales_teacher_follows.attitude_id = ?", "#{params[:q][:attitude_id]}")
+      end
+
       if params[:q].present? && params[:q][:description].present?
         @follow_ups = @follow_ups.where("educode_sales_teacher_follows.description LIKE ?" ,"%#{params[:q][:description]}%")
       end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -96,6 +96,9 @@ module EducodeSales
               @teachers = @teachers.where("educode_sales_teachers.user_id is null")
             end
           end
+          if params[:q].present? && params[:q][:mobile].present?
+            @teachers = @teachers.joins(:user).where("users.phone like ?", "%#{params[:q][:mobile]}%")
+          end
           if params[:q].present? && params[:q][:attitude].present?
             # @teachers = @teachers.where("educode_sales_teachers.attitude_id = ?", "#{params[:q][:attitude]}")
             @teachers = @teachers.joins("

data/app/models/educode_sales/business.rb

@@ -19,7 +19,7 @@ module EducodeSales
     default_scope  -> {where(deleted_at: nil)}
 
     def soft_destroy(user_id)
-      self.update(deleted_at: Time.now)
+      self.update(deleted_at: Time.now, state_id: 2)
       self.sale_plans.each do |d|
         d.soft_destroy(user_id)
       end