educode_sales 1.10.49 → 1.10.59

data/app/controllers/educode_sales/plans_controller.rb

@@ -2,7 +2,7 @@ require_dependency "educode_sales/application_controller"
 
 module EducodeSales
   class PlansController < ApplicationController
-
+    protect_from_forgery
     def index
       # authorize! :read, SalePlan
       respond_to do |format|
@@ -93,7 +93,7 @@ module EducodeSales
           render_failure plan
         end
       end
-      
+
     end
 
     def create_business_info
@@ -112,7 +112,7 @@ module EducodeSales
       common = Common.find_by(clazz: 'staff_type', name: '销售')
       @staffs = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
 
-      
+
       @week = Time.now.strftime('%W').to_i
       week = Time.now.strftime('%W').to_i
       if week > 3
@@ -153,7 +153,7 @@ module EducodeSales
       @commons = Common.where(clazz: '计划类型').pluck(:name, :id)
       common = Common.find_by(clazz: 'staff_type', name: '销售')
       @staffs = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
-      
+
       @business = Business.find_by(id: params[:business_id])
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
       @businesses =Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
@@ -181,7 +181,7 @@ module EducodeSales
           @businesses =  @businesses.limit(10)
         end
         @businesses =  @businesses.order(created_at: :desc)
-       
+
         @businesses = @businesses.map { |b| {name: b.name + "(#{b.department&.school&.name} #{b.department&.name})" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), value: b.id} }
         render json: { data: @businesses, code: 0, msg: "success" }
       end
@@ -233,7 +233,7 @@ module EducodeSales
       business_ids << @sale_plan.business_id
       @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
       @businesses = @businesses.map { |b| [b.name + "(" + b.department&.school&.name.to_s + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
-  
+
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
         if week > 3
@@ -389,6 +389,51 @@ module EducodeSales
       @sale_plans = @sale_plans.page(params[:page]).per(params[:limit])
     end
 
+    def years_all_target
+      #目标类别
+      target_clazz = params[:target_clazz]
+      #年份
+      year = params[:year].present? ? params[:year].to_i : Date.today.year.to_i
+      type = params[:type]
+      #员工id
+      staff_id = params[:staff_id]
+      #客户类型
+      school_tag_id = params[:school_tag_id]
+
+      if @current_admin.is_admin?
+      else
+        level = @current_admin.role.role_areas.find_by(clazz: '销售计划').level
+        case level
+        when '自己'
+          staff_id = @current_admin.id
+        when '区域'
+          staff_id = @current_admin.id
+        else
+        end
+      end
+
+      if type.present? && type == 'all'
+        @data = get_sales_all_plan(0, '', year, school_tag_id)
+        @total_count = 1
+      else
+        staffs =
+          if staff_id.present?
+            EducodeSales::Staff.where(id: staff_id)
+          else
+            EducodeSales::Staff.all
+          end
+        @total_count = staffs.count
+        staffs = staffs.page(params[:page]).per(params[:limit])
+        @data = []
+        staffs.each do |staff|
+          @data += get_sales_all_plan(staff.id, staff.name, year, school_tag_id)
+        end
+      end
+      if target_clazz.present?
+         @data.delete_if { |item| !target_clazz.include?(item['target_clazz'])}
+      end
+    end
+
     def my_years_plan
       @sale_plans = SalePlan.where(staff_id: @current_admin.id)
     end
@@ -511,19 +556,183 @@ module EducodeSales
     end
 
 
-    def target_track
+    def year_execute
+      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]}
+          gon.school_tags = SchoolTag.where(for_missions: true).map { |d| {value: d.id, name: d.name } }
+        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
+
+    def year_target
       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 } }
+          gon.month = Time.now.month
+        end
+        format.json do
+
+          if @current_admin.is_admin?
+            @data = EducodeSales::SalesTargetHistory.all
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '销售计划').level
+            case level
+            when '自己'
+              @data = EducodeSales::SalesTargetHistory.where(staff_id: @current_admin.id)
+            when '区域'
+              @data = EducodeSales::SalesTargetHistory.all
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
+              @data = @data.where(staff_id: staff_ids)
+            else
+              @data = EducodeSales::SalesTargetHistory.all
+            end
+          end
+          @data = @data.order("staff_id asc,num desc, is_use desc,field(state, 1,0,2), id desc")
+          if params[:year].present?
+            @data = @data.where(year: params[:year])
+          end
+          if params[:school_tag_id].present?
+            @data = @data.where(school_tag_id: params[:school_tag_id])
+          end
+          if params[:staff_id].present?
+            @data = @data.where(staff_id: params[:staff_id])
+          end
+          if params[:year_target].present?
+            @data = @data.where(year_target: params[:year_target])
+          end
+          if params[:target_clazz].present?
+            @data = @data.where(target_clazz: params[:target_clazz])
+          end
+          @data = @data.page(params[:page]).per(params[:limit])
         end
       end
     end
 
+    def cal_finish_amount
+      start_at = params[:year] + "-01-01"
+      end_at = params[:year] + "-12-31"
+      amount = 0
+      case  params[:target_clazz]
+      when "回款"
+        # 对应销售经理下回款时间的回款金额
+        amount = EducodeSales::MoneyPlanRecord.joins("
+            LEFT JOIN educode_sales_follow_ups AS last_follow_up ON educode_sales_businesses.last_follow_up_id = last_follow_up.id AND last_follow_up.deleted_at IS NULL
+            LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = last_follow_up.id").
+          joins(business: [department: [school: :school_tags]]).where("school_tags.id = ?", params[:school_tag_id]).
+          where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", params[:staff_id], params[:staff_id]).
+          where("date_at >= ? AND date_at <= ?", start_at, end_at).sum("amount")
+
+      when '商机'
+        a_clazz = EducodeSales::Common.find_by(extras: 'a_class')
+        start_at = "#{params[:year]}-01-01 00:00:01"
+        end_at = "#{params[:year]}-12-31 23:59:59"
+        staff_id =  params[:staff_id]
+        # 对应销售经理下A类商机预算金额
+        amount = EducodeSales::Business.from("(
+          SELECT distinct educode_sales_businesses.id, last_follow_up.budget_amount, educode_sales_businesses.deleted_at, educode_sales_businesses.department_id
+          FROM educode_sales_businesses
+          JOIN educode_sales_follow_ups ON educode_sales_follow_ups.business_id = educode_sales_businesses.id AND educode_sales_businesses.clazz_id = #{a_clazz.id}
+               AND educode_sales_follow_ups.created_at > '#{start_at}' AND educode_sales_follow_ups.created_at < '#{end_at}'
+          JOIN educode_sales_follow_ups AS last_follow_up ON educode_sales_businesses.last_follow_up_id = last_follow_up.id AND last_follow_up.deleted_at IS NULL AND last_follow_up.clazz_id = #{a_clazz.id}
+          LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = last_follow_up.id
+          WHERE (educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = '#{staff_id}') OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = '#{staff_id}')
+          ) AS educode_sales_businesses
+        ").joins(department: [school: :school_tags]).where("school_tags.id = ?", params[:school_tag_id]).sum(:budget_amount)
+      when '中标'
+        # 对应销售经理下合同列表的中标时间下合同金额
+        contract_ids = EducodeSales::Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
+        businesses = EducodeSales::Business.joins("
+          JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+        ").joins("LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = educode_sales_businesses.last_follow_up_id").
+          joins(department: [school: :school_tags]).where("school_tags.id = ?", params[:school_tag_id]).
+          where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", params[:staff_id], params[:staff_id]).
+          where("educode_sales_follow_ups.stage_id in (?)", contract_ids).
+          where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", start_at, end_at).sum(:actual_amount)
+      end
+      render json: {amount: amount}
+    end
+
+    def add_year_target
+      history = EducodeSales::SalesTargetHistory.find_by(staff_id: params[:staff_id], year: params[:year], school_tag_id: params[:school_tag_id], target_clazz: params[:target_clazz])
+      # history.update_attributes(params.permit(:m_target_1, :m_target_2, :m_target_3, :m_target_4, :m_target_5, :m_target_6, :m_target_7, :m_target_8, :m_target_9, :m_target_10, :m_target_11, :m_target_12)) if history
+      # 不能重复添加
+      #if EducodeSales::SalesTargetHistory.exists?(staff_id: params[:staff_id], year: params[:year], school_tag_id: params[:school_tag_id], target_clazz: params[:target_clazz])
+      #  return render_failure "不能重复添加"
+      #end
+      target = EducodeSales::SalesTargetHistory.new(year_target_param)
+      if history
+        use_old_attributes = %w[m_target_1 m_target_2 m_target_3 m_target_4 m_target_5 m_target_6 m_target_7 m_target_8 m_target_9 m_target_10 m_target_11 m_target_12] - params.keys
+        use_old_attributes.each do |attr|
+          target[attr] = history[attr]
+        end
+      end
+      if history
+        target.num = history.num
+      else
+        target.num = EducodeSales::SalesTargetHistory.maximum(:id).to_i + 1
+      end
+
+      target.creator_id = @current_admin.id
+      target.state = '待审核'
+      if target.save
+        render json: { id: target.id, state: target.state, updated_at: target.updated_at.to_s(:date) }
+      else
+        render_failure target
+      end
+    end
+
+    def update_year_target
+      target = EducodeSales::SalesTargetHistory.find(params[:id])
+      if target.state == '待审核'
+        if params[:state] == '已通过'
+          other_uses =  EducodeSales::SalesTargetHistory.where(num: target.num, is_use: true).order(id: :desc)
+          if other_uses
+            other_uses.update(is_use: false)
+            last_use = other_uses.last
+            # 最近采用的月份目标复制过来
+            12.times do |i|
+              if last_use.send("target_#{i+1}").present?
+                target.send("target_#{i+1}=", last_use.send("target_#{i+1}") )
+              end
+            end
+          end
+          # 采用修改的月份目标
+          12.times do |i|
+            if target.send("m_target_#{i+1}").present?
+              target.send("target_#{i+1}=", target.send("m_target_#{i+1}") )
+            end
+          end
+          target.state = '已通过'
+          target.is_use = true
+        elsif params[:state] == '已驳回'
+          target.state = '已驳回'
+        end
+
+        target.comment = params[:comment]
+        target.reviewer_id = @current_admin.id
+        if target.save
+          render json: {state: target.state, updated_at: target.updated_at.to_s(:date)}
+        else
+          render_failure target
+        end
+      else
+        render json: {success: false, msg: '该状态不能编辑'}
+      end
+
+    end
+
+
     private
 
     def plan_params
@@ -536,7 +745,181 @@ module EducodeSales
 
     def update_business_info_extra_params
       params.permit(:plan_bid_on, :actual_bidded_on, :bidded_amount, :plan_sign_on, :actual_sign_on, :sign_amount, :plan_deploy_on, :actual_deploy_on, :plan_check_on,
-       :actual_check_on, :prepayment_plan_on, :prepayment_actual_on, :prepayment_amount, :check_fee_plan_on, :check_fee_actual_on, :check_fee, :qa_plan_on, :qa_actual_on, :qa_amount, :account_receivable)
+                    :actual_check_on, :prepayment_plan_on, :prepayment_actual_on, :prepayment_amount, :check_fee_plan_on, :check_fee_actual_on, :check_fee, :qa_plan_on, :qa_actual_on, :qa_amount, :account_receivable)
+    end
+
+    def year_target_param
+      params.permit(:staff_id, :year, :target_clazz, :school_tag_id, :year_finish, :year_target, :year_diff, :m_target_1, :m_target_2, :m_target_3, :m_target_4, :m_target_5, :m_target_6, :m_target_7, :m_target_8, :m_target_9, :m_target_10, :m_target_11, :m_target_12)
+    end
+
+    def make_target_data(sales_all_plan, data, column, type)
+      data.each do |item|
+        _column = "#{column}_#{item.m.gsub("0", '')}"
+        if sales_all_plan[type][item.school_tag_id].present?
+          if sales_all_plan[type][item.school_tag_id][_column].present?
+            sales_all_plan[type][item.school_tag_id][_column] += item.amount
+          else
+            sales_all_plan[type][item.school_tag_id][_column] = item.amount
+          end
+        else
+          sales_all_plan[type][item.school_tag_id] = {"school_tag_id" => item.school_tag_id, "school_tag_name" => item.school_tag_name}
+          sales_all_plan[type][item.school_tag_id][_column] = item.amount
+        end
+        sales_all_plan[type][item.school_tag_id]['type'] = type
+      end
+      sales_all_plan
+    end
+
+    def get_sales_all_plan(staff_id, staff_name, year, school_tag_id)
+
+      follow_up_ids = ''
+      if staff_id.present?
+        follow_up_ids = EducodeSales::AssignFollowUp.where(staff_id: staff_id).pluck(:follow_up_id).compact.join(',')
+      end
+      # 中标&商机&回款 - 目标按月
+      sales_target_histories = EducodeSales::SalesTargetHistory.from("
+         (SELECT H.id,clazz,school_tag_id,T.name as school_tag_name,sum(m_target_1) as target_1, sum(m_target_2) target_2, sum(m_target_3) target_3, sum(m_target_4) target_4, sum(m_target_5) target_5, sum(m_target_6) target_6, sum(m_target_7) target_7,sum(m_target_8) target_8,sum(m_target_9) target_9, sum(m_target_10) target_10, sum(m_target_11) target_11, sum(m_target_12) target_12
+         FROM educode_sales_sales_target_histories as H
+         LEFT JOIN school_tags AS T ON H.school_tag_id = T.id
+         WHERE is_use = 1 AND year = #{year} AND T.for_missions = 1
+         #{staff_id.present? ? " AND staff_id = #{staff_id}" : ""}
+         #{school_tag_id.present? ? " AND school_tag_id in (#{school_tag_id})" : ""}
+         GROUP BY clazz,school_tag_id) as educode_sales_sales_target_histories
+      ").order('clazz asc, school_tag_id asc,id desc')
+
+      start_at = Date.new(year, 1, 1)
+      end_at = Date.new((year + 1), 1, 1)
+      follow_up_ids_where =
+      if staff_id.present?
+        follow_up_ids_where = follow_up_ids.present? ? " AND B.last_follow_up_id in (#{follow_up_ids})" : " AND B.id in(0)"
+      end
+
+      # 中标 - 完成
+      bidder_finish = EducodeSales::FollowUp.select('amount,m,school_tag_id,school_tag_name').from(
+        "(SELECT sum(F.actual_amount) as amount, date_format(F.bidded_date, '%m') as m,T.name as school_tag_name,
+          TM.school_tag_id as school_tag_id,F.deleted_at
+          FROM educode_sales_businesses AS B
+          LEFT JOIN educode_sales_follow_ups as F ON B.last_follow_up_id=F.id
+          LEFT JOIN school_tag_middles AS TM ON TM.school_id=B.school_id
+          LEFT JOIN school_tags as T ON TM.school_tag_id=T.id
+          WHERE F.deleted_at IS NULL AND T.for_missions = 1 AND F.bidded_date BETWEEN '#{start_at}' AND '#{end_at}'
+          #{follow_up_ids_where.present? ? follow_up_ids_where : ''}
+          #{school_tag_id.present? ? " AND school_tag_id in (#{school_tag_id})" : ""}
+          GROUP BY school_tag_id,m
+          ) AS educode_sales_follow_ups"
+      ).order('school_tag_id ASC, m asc')
+
+      # 中标 - 计划
+      bidder_plan = EducodeSales::FollowUp.select('amount,m,school_tag_id,school_tag_name').from(
+        "(SELECT sum(plan_return_money) as amount, date_format(plan_return_date, '%m') as m,T.name as school_tag_name,
+          TM.school_tag_id as school_tag_id,F.deleted_at
+          FROM educode_sales_businesses AS B
+          LEFT JOIN educode_sales_follow_ups as F ON B.last_follow_up_id=F.id
+          LEFT JOIN school_tag_middles AS TM ON TM.school_id=B.school_id
+          LEFT JOIN school_tags as T ON TM.school_tag_id=T.id AND T.for_missions = 1
+          WHERE F.deleted_at IS NULL AND T.for_missions = 1 AND F.plan_return_date BETWEEN '#{start_at}' AND '#{end_at}'
+          #{follow_up_ids_where.present? ? follow_up_ids_where : ''}
+          #{school_tag_id.present? ? " AND school_tag_id in (#{school_tag_id})" : ""}
+          GROUP BY school_tag_id,m
+          ORDER BY school_tag_id ASC
+          ) AS educode_sales_follow_ups"
+      ).order('school_tag_id ASC, m asc')
+      # 回款 - 完成
+      money_finish = EducodeSales::MoneyPlanRecord.select('amount,m,school_tag_id,school_tag_name').from(
+        "(SELECT sum(amount) as amount, date_format(R.date_at, '%m') as m,T.name as school_tag_name,
+          TM.school_tag_id as school_tag_id
+          FROM educode_sales_money_plan_records as R
+          LEFT JOIN educode_sales_businesses AS B ON R.business_id=B.id
+          LEFT JOIN school_tag_middles AS TM ON TM.school_id=B.school_id
+          LEFT JOIN school_tags as T ON TM.school_tag_id=T.id AND T.for_missions = 1
+          WHERE T.for_missions = 1 AND R.date_at BETWEEN '#{start_at}' AND '#{end_at}'
+          #{follow_up_ids_where.present? ? follow_up_ids_where : ''}
+          #{school_tag_id.present? ? " AND school_tag_id in (#{school_tag_id})" : ""}
+          GROUP BY school_tag_id,m
+          ORDER BY school_tag_id ASC
+          ) AS educode_sales_money_plan_records"
+      ).order('school_tag_id ASC, m asc')
+      # 回款 - 计划                                      .group_by { |d| d.m }
+      money_plan = EducodeSales::FollowUp.select('amount,m,school_tag_id,school_tag_name').from(
+        "(SELECT sum(plan_return_money) as amount, date_format(plan_return_date, '%m') as m,T.name as school_tag_name,
+          F.deleted_at,TM.school_tag_id as school_tag_id
+          FROM educode_sales_businesses AS B
+          LEFT JOIN educode_sales_follow_ups as F ON B.last_follow_up_id=F.id
+          LEFT JOIN school_tag_middles AS TM ON TM.school_id=B.school_id
+          LEFT JOIN school_tags as T ON TM.school_tag_id=T.id AND T.for_missions = 1
+          WHERE F.deleted_at IS NULL AND T.for_missions = 1 AND plan_return_date BETWEEN '#{start_at}' AND '#{end_at}'
+          #{follow_up_ids_where.present? ? follow_up_ids_where : ''}
+          #{school_tag_id.present? ? " AND school_tag_id in (#{school_tag_id})" : ""}
+          GROUP BY school_tag_id,m
+          ORDER BY school_tag_id ASC
+          ) AS educode_sales_follow_ups"
+      ).order('school_tag_id ASC, m asc')
+      # 商机-完成                                      .where(:bidded_date => start_datetime..end_datetime)
+      business_finish = EducodeSales::FollowUp.select('amount,m,school_tag_id,school_tag_name').from(
+        "(SELECT sum(budget_amount) as amount, date_format(bidded_date, '%m') as m,T.name as school_tag_name,
+          F.deleted_at,TM.school_tag_id as school_tag_id
+          FROM educode_sales_businesses AS B
+          LEFT JOIN educode_sales_follow_ups as F ON B.last_follow_up_id=F.id
+          LEFT JOIN school_tag_middles AS TM ON TM.school_id=B.school_id
+          LEFT JOIN school_tags as T ON TM.school_tag_id=T.id AND T.for_missions = 1
+          WHERE F.deleted_at IS NULL AND T.for_missions = 1 AND bidded_date BETWEEN '#{start_at}' AND '#{end_at}'
+          #{follow_up_ids_where.present? ? follow_up_ids_where : ''}
+          #{school_tag_id.present? ? " AND school_tag_id in (#{school_tag_id})" : ""}
+          GROUP BY school_tag_id,m
+          ) AS educode_sales_follow_ups
+          "
+      ).order('school_tag_id ASC, m asc')
+      # 商机-计划
+      business_plan = EducodeSales::FollowUp.select('amount,m,school_tag_id,school_tag_name').from(
+        "(SELECT sum(plan_a_money) as amount, date_format(plan_a_date, '%m') as m,T.name as school_tag_name,
+          F.deleted_at,TM.school_tag_id as school_tag_id
+          FROM educode_sales_businesses AS B
+          LEFT JOIN educode_sales_follow_ups as F ON B.last_follow_up_id=F.id
+          LEFT JOIN school_tag_middles AS TM ON TM.school_id=B.school_id
+          LEFT JOIN school_tags as T ON TM.school_tag_id=T.id AND T.for_missions = 1
+          WHERE F.deleted_at IS NULL AND T.for_missions = 1 AND plan_a_date BETWEEN '#{start_at}' AND '#{end_at}'
+          #{follow_up_ids_where.present? ? follow_up_ids_where : ''}
+          #{school_tag_id.present? ? " AND school_tag_id in (#{school_tag_id})" : ""}
+          GROUP BY school_tag_id,m
+          ORDER BY school_tag_id ASC
+          ) AS educode_sales_follow_ups"
+      ).order('school_tag_id ASC, m asc')
+
+      sales_all_plan = {:bidder => {}, :business => {}, :money => {}}
+      sales_target_histories.each do |history|
+        case history.clazz
+        when '中标'
+          sales_all_plan[:bidder][history.school_tag_id] = history.attributes.except('id')
+        when '商机'
+          sales_all_plan[:business][history.school_tag_id] = history.attributes.except('id')
+        when '回款'
+          sales_all_plan[:money][history.school_tag_id] = history.attributes.except('id')
+        else
+        end
+      end
+      #中标完成
+      sales_all_plan = make_target_data(sales_all_plan, bidder_finish, 'finish', :bidder)
+      #中标计划
+      sales_all_plan = make_target_data(sales_all_plan, bidder_plan, 'plan', :bidder)
+      #回款完成
+      sales_all_plan = make_target_data(sales_all_plan, money_finish, 'finish', :money)
+      #回款计划
+      sales_all_plan = make_target_data(sales_all_plan, money_plan, 'plan', :money)
+      #商机完成
+      sales_all_plan = make_target_data(sales_all_plan, business_finish, 'finish', :business)
+      #商机计划
+      sales_all_plan = make_target_data(sales_all_plan, business_plan, 'plan', :business)
+
+      data = sales_all_plan[:bidder].values + sales_all_plan[:business].values + sales_all_plan[:money].values
+
+      if data.empty?
+        data = ['id' => staff_id, 'name' => staff_name, 'target_clazz' => '商机']
+      end
+      data.each do |item|
+        item['id'] = staff_id
+        item['name'] = staff_name
+        item['target_clazz'] = item['clazz'].present? ? item['clazz'] : SalesTargetHistory::TARGET_CLAZZ_NAME[item['type']]
+      end
     end
 
   end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -943,7 +943,7 @@ module EducodeSales
       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类]
+      sale_names = %w[计划回款额 计划回款额-全部 实际回款额 实际回款额-累计 计划回款额-O类]
       case @forecast_count_range
       when "week"
         # 年初第一天周数是0会导致周数重复计算

data/app/controllers/educode_sales/shixun_dectects_controller.rb

@@ -3,9 +3,9 @@
 # 实践项目管理
 module EducodeSales
   class ShixunDectectsController < ApplicationController
-    before_action :subject_members
-
+    before_action :subject_members, :subject_url
     def index
+      authorize! :checkout, BusinessDeliverSubject
       respond_to do |format|
         format.html do
         end
@@ -15,7 +15,7 @@ module EducodeSales
           if params[:q].present? && params[:q][:index].present?
             index = params[:q][:index].to_i
           end
-          @shixun_dectects = BusinessSubjectShixun.joins(:shixun)
+          @shixun_dectects = BusinessSubjectShixun.left_joins(:shixun)
                                                   .left_joins(:school)
                                                   .joins(last_dectect: [reviewed_staff: :user])
 
@@ -27,17 +27,38 @@ module EducodeSales
           end
 
           case index
-          when 1 # 显示待审核的 和审核被打回的
-            @shixun_dectects = @shixun_dectects.where("dectect_type != 1")
+          when 1 # 显示待审核的
+            @shixun_dectects = @shixun_dectects.where("dectect_type = 0")
 
           when 2 # 显示已审核的
-            @shixun_dectects = @shixun_dectects.where("dectect_type = 1 or dectect_type = 2")
+            str = 'dectect_type = 1 or dectect_type = 2'
+            if params[:q].present? && params[:q][:dectect_type].present?
+              if params[:q][:dectect_type].to_i == 1
+                str = "dectect_type = 1"
+              elsif params[:q][:dectect_type].to_i == 2
+                str = "dectect_type = 2"
+              end
+            end
+            @shixun_dectects = @shixun_dectects.where(str)
           else
             render_failure("操作失败，index只能为1,2")
           end
+          times = {}
+          BusinessSubjectShixun.includes(business_subject:[ business_deliver_subject: [:manages, business: [:school, last_follow_up: :assign_follow_ups]] ]).find_each do |d|
+            b_d_s = d.business_subject
+            if b_d_s.blank? || b_d_s.business.blank?
+              times.merge!({"#{d.id}": d.deliver_date })
+            elsif b_d_s.business.present?
+              times.merge!({ "#{d.id}": b_d_s.business.last_follow_up.reception_at })
+            end
+          end
+          @times = times.stringify_keys
+          @url
           @shixun_dectects = @shixun_dectects.select("educode_sales_business_subject_shixuns.*,
                                               schools.name as school_name,
-                                              shixuns.name as shixun_name,
+                                              shixuns.identifier,
+                                              educode_sales_business_subject_shixuns.name as shixun_name,
+                                              educode_sales_business_subject_shixuns.id as shixuns_id,
                                               CONCAT(users.lastname, users.firstname) as real_name,
                                               educode_sales_shixun_dectects.dectect_type,
                                               educode_sales_shixun_dectects.content")
@@ -50,15 +71,24 @@ module EducodeSales
 
     # 审核提交
     def submit
+      authorize! :checkout, BusinessDeliverSubject
       respond_to do |format|
         format.json do
           ActiveRecord::Base.transaction do
-            @shixuns = ShixunDectect.find_by(business_subject_shixun_id: params[:id])
+            @shixuns = ShixunDectect.order(created_at: :desc).find_by(business_subject_shixun_id: params[:id])
             if @shixuns.blank?
               @shixuns = ShixunDectect.create!(business_subject_shixun_id: params[:id],
                                                reviewed_id: current_user.id,
                                                dectect_type: 0)
-              BusinessSubjectShixun.find(params[:id]).update(shixun_dectect_id: @shixuns.id)
+              BusinessSubjectShixun.find(params[:id]).update(shixun_dectect_id: @shixuns.id,
+                                                             shixun_status:4)
+              render_success
+            elsif @shixuns.present? && @shixuns.dectect_type == 'agreed'
+              @shixuns = ShixunDectect.create!(business_subject_shixun_id: params[:id],
+                                               reviewed_id: current_user.id,
+                                               dectect_type: 0)
+              BusinessSubjectShixun.find(params[:id]).update(shixun_dectect_id: @shixuns.id,
+                                                             shixun_status:4)
               render_success
             else
               render_failure("已经提交过了")
@@ -70,16 +100,43 @@ module EducodeSales
 
     # 通过审核
     def examine
+      authorize! :checkout, BusinessDeliverSubject
       ActiveRecord::Base.transaction do
         if params[:id].present? && params[:type].present?
           business_subject_shixun = BusinessSubjectShixun.find(params[:id])
-          if business_subject_shixun.present?
-            shixun_dectect = ShixunDectect.create!(reviewed_id: current_user.id,
-                                                   date: Time.now,
-                                                   content: params[:content].gsub(/\r\n?/, "\n").strip,
-                                                   business_subject_shixun_id: params[:id],
-                                                   dectect_type: params[:type].to_i)
-            business_subject_shixun.update(shixun_dectect_id: shixun_dectect.id,shixun_status:5)
+          if business_subject_shixun.present? && business_subject_shixun.last_dectect.present?
+
+            shixun_dectect = business_subject_shixun.last_dectect
+                                                    .update(reviewed_id: current_user.id,
+                                                     date: Time.now,
+                                                     content: params[:content].gsub(/\r\n?/, "\n").strip,
+                                                     business_subject_shixun_id: params[:id],
+                                                     dectect_type: params[:type].to_i)
+            if params[:type].to_i == 2
+              business_subject_shixun.update( shixun_status: 5)
+            elsif params[:type].to_i == 1
+              # 审核通过
+              business_subject_shixun.update( shixun_status: 9)
+            end
+            arrs = []
+            user_list = business_subject_shixun.all_staff.map{ |item| item.id}
+
+            user_list.each do |item|
+              attr = {
+                user_id: item,
+                trigger_user_id: 0,
+                container_id: business_subject_shixun.shixun_dectect_id.to_i,
+                container_type: 'EducodeSales::ShixunDectect',
+                tiding_type: "Project",
+                belong_container_type: "User",
+                belong_container_id: item,
+                created_at: Time.now,
+                updated_at: Time.now
+              }
+              arrs << attr
+            end
+            Tiding.create!(arrs)
+
           end
           render_success
         else
@@ -91,13 +148,16 @@ module EducodeSales
     # 审核拒绝通过
 
     def edit
+      authorize! :checkout, BusinessDeliverSubject
       render layout: false
     end
 
     def update
+      authorize! :checkout, BusinessDeliverSubject
     end
 
     def new
+      authorize! :checkout, BusinessDeliverSubject
       render layout: false
     end
 
@@ -105,6 +165,7 @@ module EducodeSales
     end
 
     def markdown
+      authorize! :checkout, BusinessDeliverSubject
       render layout: false
     end
   end