educode_sales 1.10.37 → 1.10.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b46b08f02fd4495dc7dcbe644409b09c38fd9936ce81c574d8747eadeb935dab
-  data.tar.gz: 874c54125a516d0631812e60fb439418cf050550dfd40166777762d4e6b48221
+  metadata.gz: ee0e4fc5519c5e1dc171f8d0402f6f3e681e9b89636a7f424a642aaf88a23ce9
+  data.tar.gz: c060d33dfc08508f868182e5c3b8f8d780a20c03d8c300631a7a7c39316bfccc
 SHA512:
-  metadata.gz: 6e3f554a6a434861cc05e461b6a7c9b9af265917f2fce21cc947fcf51d206de976fe8d7abe7f2684eaa075cc8f045d601535885dd0b64dbf61db7d9ae1552a8a
-  data.tar.gz: aa3c405230daa0c34902d42a4d6e3fabfeea3b7c6be4611a4535a5dbdcf57f1921e906da9397e7fc3c1d6e0ef60985ef3bc39e632c2f0f190ef703d93c54413e
+  metadata.gz: 5d82966240ed50554d5525c93254d1f282fe9a604e350f9ae81309726187f43d419e9849b1047f6b996bd6bebd91c12d57b0ea1c9691e5913eb41a29da0df206
+  data.tar.gz: 433b7c1181791a6a47a5d35ff5df90363607e9d8c1592056d9fbf546b373c42a29d0bc67d92bdfc67b7f6f504970ff61edf55a2b5b992e3d993dc2fe3861cc14

data/app/controllers/educode_sales/application_controller.rb

@@ -41,6 +41,19 @@ module EducodeSales
       end
     end
 
+    def paginate(relation)
+      limit = params[:limit] || params[:per_page]
+      limit  = (limit.to_i.zero? || limit.to_i > 100) ? 20 : limit.to_i
+      page   = params[:page].to_i.zero? ? 1 : params[:page].to_i
+      offset = (page - 1) * limit
+
+      if relation.is_a?(Array)
+        relation[offset, limit]
+      else
+        relation.limit(limit).offset(offset)
+      end
+    end
+
 
 
     rescue_from CanCan::AccessDenied do |exception|

data/app/controllers/educode_sales/contracts_controller.rb

@@ -206,8 +206,8 @@ module EducodeSales
             @businesses = @businesses.order("educode_sales_businesses.created_at desc")
           end
 
-
-          @businesses = @businesses.select("
+          if params[:page].present?
+            @businesses = @businesses.select("
             distinct
             educode_sales_businesses.*,
             last_follow.invitation_at,
@@ -237,8 +237,38 @@ module EducodeSales
               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
 
-
+          @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])
         end
       end
     end

data/app/controllers/educode_sales/ideas_controller.rb

@@ -44,6 +44,9 @@ module EducodeSales
           @sale_staff_arr = EducodeSales::Staff.joins(:user).where(id: sale_staff_ids).pluck("concat(users.lastname,users.firstname)", :id)
           filter = Filter.find_or_create_by(staff_id: @current_admin.id, clazz: "ideas")
           gon.filter = filter.extras || {}
+
+          #协助人
+          @assist_staffs = Staff.where.not(role_id: 11).includes(:user).map{ |d| {name: d.user.real_name, value: d.id}}
         end
         format.json do
           @ideas = params[:is_deleted].to_s == "true" ? Idea.deleted : Idea.not_deleted
@@ -54,14 +57,14 @@ module EducodeSales
             level = @current_admin.role.role_areas.find_by(clazz: '方案管理').try(:level)
             case level
             when '自己'
-              idea_ids = @ideas.select { |d| Array(d.other_staff_ids).include?(@current_admin.id) || d.sale_staff_id == @current_admin.id || Array(d.assist_staff_ids).include?(@current_admin.id) || d.staff_id == @current_admin.id }.map { |d| d.id }
+              idea_ids = @ideas.select { |d| Array(d.other_staff_ids).include?(@current_admin.id.to_s) || d.sale_staff_id == @current_admin.id || Array(d.assist_staff_ids).include?(@current_admin.id.to_s) || d.staff_id == @current_admin.id }.map { |d| d.id }
               @ideas = @ideas.where("educode_sales_ideas.creator_id = ? OR educode_sales_ideas.id in (?)", @current_admin.id, idea_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
-              idea_ids = @ideas.select { |d| Array(d.other_staff_ids).include?(@current_admin.id) || d.sale_staff_id == @current_admin.id || Array(d.assist_staff_ids).include?(@current_admin.id) || d.staff_id == @current_admin.id }.map { |d| d.id }
+              idea_ids = @ideas.select { |d| Array(d.other_staff_ids).include?(@current_admin.id.to_s) || d.sale_staff_id == @current_admin.id || Array(d.assist_staff_ids).include?(@current_admin.id.to_s) || d.staff_id == @current_admin.id }.map { |d| d.id }
               @ideas = @ideas.left_joins(department: :school).where("schools.id in (?) OR educode_sales_ideas.creator_id = ? OR educode_sales_ideas.id in (?)", school_ids, @current_admin.id, idea_ids)
             else
               @ideas = @ideas
@@ -74,7 +77,7 @@ module EducodeSales
             @ideas = @ideas.where("educode_sales_ideas.created_at >= ? AND educode_sales_ideas.created_at <= ?", date[0] + " 00:00:00", date[1] + " 23:59:59")
           end
           if params[:q].present? && params[:q][:name].present?
-            @ideas = @ideas.where("educode_sales_ideas.name like ?", "%#{params[:q][:name]}%")
+            @ideas = @ideas.joins(:business).where("educode_sales_ideas.name like ? or educode_sales_businesses.name like ?", "%#{params[:q][:name]}%", "%#{params[:q][:name]}%")
           end
           if params[:q].present? && params[:q][:school].present?
             @ideas = @ideas.left_joins(:school).where("schools.name like ?", "%#{params[:q][:school]}%")
@@ -109,7 +112,12 @@ module EducodeSales
             @ideas = @ideas.where(level: params[:q][:level])
           end
 
-          @ideas = @ideas.page(params[:page]).per(params[:limit])
+          if params[:q].present? && params[:q][:assist_staffs].present?
+            @ideas = @ideas.select{|d| d&.assist_staff_ids.include?(params[:q][:assist_staffs])}
+          end
+          @ideas_count = @ideas.count
+
+          @ideas = paginate @ideas
         end
       end
     end
@@ -141,10 +149,11 @@ module EducodeSales
       other_staff_ids = Array(params[:other_staff_ids].to_s.split(","))
       if params[:business_id].present?
         idea.business_id = params[:business_id]
+        idea.school_id = idea.business&.department&.school_id
       elsif params[:school_id].present?
         idea.name = params[:project_name]
       end
-      if params[:school_id].present?
+      if idea.school_id.blank?
         idea.school_id = params[:school_id]
       end
       idea.attachment_ids = attachment_ids
@@ -180,10 +189,11 @@ module EducodeSales
       # @idea.other_staff_ids = other_staff_ids
       if params[:business_id].present?
         @idea.business_id = params[:business_id]
+        @idea.school_id = @idea.business&.department&.school_id
       elsif params[:school_id].present?
         @idea.name = params[:project_name]
       end
-      if params[:school_id].present?
+      if @idea.school_id.blank?
         @idea.school_id = params[:school_id]
       end
       check_changes
@@ -357,7 +367,7 @@ module EducodeSales
       params.permit(:name, :level, :staff_id,
                     :status, :types, :model, :hardware, :project,
                     :money, :end_time, :content, :department_id,
-                    :manager_name, :manager_phone, :school_name, :department_name, :attachment_id, :idea_type)
+                    :manager_name, :manager_phone, :school_name, :department_name, :attachment_id, :idea_type, :school_id, :business_id)
     end
 
     def find_idea

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -18,6 +18,7 @@ module EducodeSales
         format.json do
           @money_plan_records = MoneyPlanRecord.left_joins(:money_plan_claims).group("educode_sales_money_plan_records.id").select("educode_sales_money_plan_records.*, COUNT(educode_sales_money_plan_claims.id) AS claim_num")
           if @current_admin.is_admin?
+            @money_plan_records = @money_plan_records
           else
             level = @current_admin.role.role_areas.find_by(clazz: '回款管理').level
             case level
@@ -79,7 +80,11 @@ module EducodeSales
           else
             @money_plan_records = @money_plan_records.order(created_at: :desc)
           end
-          @money_plan_records = @money_plan_records.page(params[:page]).per(params[:limit])
+
+          if params[:page].present?
+            @money_plan_records = @money_plan_records.page(params[:page]).per(params[:limit])
+          end
+          @money_plan_records = @money_plan_records
         end
       end
     end
@@ -195,12 +200,14 @@ module EducodeSales
               key_person.save
             end
 
-            last_follow_up.money_plans.each do |d|
-              money = d.dup
-              money.staff = @current_admin
-              money.follow_up_id = follow_up.id
-              money.save
-            end
+            # last_follow_up.money_plans.each do |d|
+            #   money = d.dup
+            #   money.staff = @current_admin
+            #   money.follow_up_id = follow_up.id
+            #   money.save
+            # end
+             # 上次的回款计划的跟进也要同步到最新的跟进id，不然回款计划列表会找不到
+             EducodeSales::MoneyPlan.where(business_id: d.id, id: params[:money_plan_ids]).update_all(follow_up_id: follow_up.id)
 
             # 合同里签到日期全同步到最新跟进
             last_follow_up.contract_date_lists.update_all(follow_up_id: follow_up.id)

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -59,7 +59,11 @@ module EducodeSales
           else
             @money_plans = @money_plans.order(date_at: :desc)
           end
-          @money_plans = @money_plans.page(params[:page]).per(params[:limit])
+
+          if params[:page].present?
+            @money_plans = @money_plans.page(params[:page]).per(params[:limit])
+          end
+          @money_plans = @money_plans
         end
       end
     end

data/app/controllers/educode_sales/plans_controller.rb

@@ -510,6 +510,20 @@ module EducodeSales
       @months = (1..12).map { |d| d }
     end
 
+
+    def target_track
+      respond_to do |format|
+        format.html do
+         
+        end
+        format.js 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
+      end
+    end
+
     private
 
     def plan_params

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -418,6 +418,15 @@ module EducodeSales
       end
     end
 
+    #回款预测图
+    def return_money_forecast
+      respond_to do |format|
+        format.js do
+          return_forecast_by_money
+        end
+      end
+    end
+
     def user_stat
       respond_to do |format|
         format.html do
@@ -537,7 +546,7 @@ module EducodeSales
       data_1_hash = {}
       data_1_total_hash = {}
       data_1.each do |d|
-        data_1_hash[d.month] = d.count_type.round(2)
+        data_1_hash[d.month] = d.count_type ? d.count_type.round(2) : 0
       end
 
       last_month = 0
@@ -577,10 +586,14 @@ module EducodeSales
         last_month = month.split("-")[0]
       end
 
-      data_3 = business.joins(last_follow_up: :money_plans).
-        where("educode_sales_follow_ups.clazz_id != ?", x).
-        where.not("educode_sales_money_plans.clazz!= ?", 1).
-        where("educode_sales_money_plans.date_at >= ? AND educode_sales_money_plans.date_at <= ?", begin_at, end_at).
+      data_3 = EducodeSales::MoneyPlanRecord.from("(
+                  SELECT distinct(educode_sales_money_plan_records.id), educode_sales_money_plan_records.amount, date_at
+                  FROM educode_sales_money_plan_records
+                  JOIN educode_sales_money_plan_claims ON educode_sales_money_plan_claims.money_plan_record_id = educode_sales_money_plan_records.id
+                  GROUP BY educode_sales_money_plan_records.id
+                  ) AS educode_sales_money_plan_records
+                ").
+        where("educode_sales_money_plan_records.date_at >= ?  AND educode_sales_money_plan_records.date_at <= ? ",  begin_at, end_at).
         select("SUM(amount) AS count_type, DATE_FORMAT(date_at, '%Y-%m') AS month").
         group("DATE_FORMAT(date_at, '%Y-%m')").
         order("DATE_FORMAT(date_at, '%Y-%m')")
@@ -692,10 +705,14 @@ module EducodeSales
         last_month = month.split("-")[0]
       end
 
-      data_3 = EducodeSales::Business.joins(last_follow_up: :money_plans).
-        where("educode_sales_follow_ups.clazz_id != ?", x).
-        where.not("educode_sales_money_plans.clazz!= ?", 1).
-        where("educode_sales_money_plans.date_at >= ? AND educode_sales_money_plans.date_at <= ?", begin_at, end_at).
+      data_3 = EducodeSales::MoneyPlanRecord.from("(
+                  SELECT distinct(educode_sales_money_plan_records.id), educode_sales_money_plan_records.amount, date_at
+                  FROM educode_sales_money_plan_records
+                  JOIN educode_sales_money_plan_claims ON educode_sales_money_plan_claims.money_plan_record_id = educode_sales_money_plan_records.id
+                  GROUP BY educode_sales_money_plan_records.id
+                  ) AS educode_sales_money_plan_records
+                ").
+        where("educode_sales_money_plan_records.date_at >= ?  AND educode_sales_money_plan_records.date_at <= ? ",  begin_at, end_at).
         select("SUM(amount) AS count_type, DATE_FORMAT(date_at, '%Y') AS year").
         group("DATE_FORMAT(date_at, '%Y')").
         order("DATE_FORMAT(date_at, '%Y')")
@@ -919,5 +936,61 @@ module EducodeSales
 
       visit_analysis_charts(visit_count_year, visit_count_season, visit_count_month, visit_count_week, visit_type, title_names)
     end
+
+
+    def return_forecast_by_money
+      property = params[:property] || nil
+      staff_id = params[:staff_id] || nil
+      @forecast_count_range = params[:forecast_count_range] || "month"
+      forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%m") }.uniq
+      sale_names = %w[实际回款额 计划回款额 实际回款 计划回款额-全部 计划回款额-o类]
+      case @forecast_count_range
+      when "week"
+        # 年初第一天周数是0会导致周数重复计算
+        if params[:forecast_date_day].present?
+          date = params[:forecast_date_day].split(" - ")
+          dates = (date[0].to_date..date[1].to_date).map { |d| d.strftime("%Y-%W") }.uniq.select { |d| d.split("-")[1] != '00' }
+          @return_forecast_count_data = return_money_forecast_week(dates, sale_names, staff_id, property)
+        else
+          forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%W") }.uniq.select { |d| d.split("-")[1] != '00' }
+          @return_forecast_count_data = return_money_forecast_week(forecast_default_dates, sale_names, staff_id, property)
+        end
+      when "quarter"
+        # 按年
+        if params[:forecast_date_year].present?
+          date = params[:forecast_date_year].split(" - ")
+          dates = (date[0]..date[1]).to_a
+          dates = dates.map { |d| [d.to_s + "-" + "1", d.to_s + "-" + "2", d.to_s + "-" + "3", d.to_s + "-" + "4"] }.flatten
+          @return_forecast_count_data = return_money_forecast_quarter(dates, sale_names, staff_id, property)
+        else
+          forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y") }.uniq
+          forecast_default_dates = forecast_default_dates.map { |d| [d.to_s + "-" + "1", d.to_s + "-" + "2", d.to_s + "-" + "3", d.to_s + "-" + "4"] }.flatten
+          @return_forecast_count_data = return_money_forecast_quarter(forecast_default_dates, sale_names, staff_id, property)
+        end
+      when "month" # 按月
+        if params[:forecast_date_month].present?
+          date = params[:forecast_date_month].split(" - ")
+          date[0] = (date[0] + "-01").to_date.to_s
+          date[1] = (date[1] + "-01").to_date.end_of_month.to_s
+          dates = ((date[0] + "-01").to_date..(date[1] + "-01").to_date).map { |d| d.strftime("%Y-%m") }.uniq
+          @return_forecast_count_data = return_money_forecast_month(dates, sale_names, staff_id, property)
+        else
+          @return_forecast_count_data = return_money_forecast_month(forecast_default_dates, sale_names, staff_id, property)
+        end
+      else
+        # 按年
+        if params[:forecast_date_year].present?
+          date = params[:forecast_date_year].split(" - ")
+          dates = (date[0]..date[1]).to_a
+          @return_forecast_count_data = return_money_forecast_year(dates, sale_names, staff_id, property)
+        else
+          forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y") }.uniq
+          @return_forecast_count_data = return_money_forecast_year(forecast_default_dates, sale_names, staff_id, property)
+        end
+      end
+      @return_forecast_count_data_0 = @return_forecast_count_data[0]
+      @return_forecast_count_data_1 = @return_forecast_count_data[1]
+    end
+
   end
 end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -204,7 +204,7 @@ module EducodeSales
           end
 
           if params[:q].present? && params[:q][:is_contact].present?
-            @teachers = @teachers.where("last_follow.is_contact = ?" , params[:q][:is_contact].to_i)
+            @teachers = @teachers.where("last_follow.is_contact = ?", params[:q][:is_contact].to_i)
           end
 
           if params[:sort].present? && params[:sort][:field]
@@ -212,7 +212,12 @@ module EducodeSales
           else
             @teachers = @teachers.order("educode_sales_teachers.created_at desc")
           end
-          @teachers = @teachers.page(params[:page]).per(params[:limit])
+          @teachers = @teachers.includes(:teacher_assign_follows, :department, :user, :follow_up, :activity_teachers, [assign_staffs: :staff])
+          if params[:type].to_s == 'export'
+            @teachers = @teachers.page(1).per(1000)
+          else
+            @teachers = @teachers.page(params[:page]).per(params[:limit])
+          end
         end
 
         end