educode_sales 1.10.49 → 1.10.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d727604aed61afc7d3df20bbfdb069c2c14d10a205e6a95c6b16af0171f2363
-  data.tar.gz: 0353401db95554ddff072354913db810537640035ded808cf3bac648dbfc9fb5
+  metadata.gz: 666b9ec9b763cfce87df4b2b6a2304625100ba52d94df0cd806fe36266062b3c
+  data.tar.gz: 494c7222e60d7114c95cd6f213fd11bb5070e2b6f40d45bfdaa3fa880c7e4a0f
 SHA512:
-  metadata.gz: b8adacfd640268d7b7e0cd88b6ad1687caaf143e83e75d6025e433ad42f7b09723e6c8d3b7bfdca71fc4af362bf1ab862d8a252b023cd545eae4e88bdcc0fcad
-  data.tar.gz: 8ba9309c8d723f146a3ae7493451b61a404721ccd0d82ea0896246c5f92a4112a78b6272a2cabb7b01cf50ab1e20491d409e5d9fc18e1bec5ead12ac2a4ec83c
+  metadata.gz: 9cc7914ec32c5e3cda9fa353bf35ddba314450b75f7401d1063469ab4f10b117437a4a93392783ddd7049e21f6012b1faba947be5b05874fd4b235c327c553c4
+  data.tar.gz: c5276a5f2d6ea22604cea8d6f81acb320f8e8ec7975138741e8e5ab6326f7f368f210a9b983fa0ab48688709de0053ad923a1043eab701b3ab19dac08910c1fc

data/app/assets/stylesheets/educode_sales/modules/easyeditor/easyeditor.css

@@ -2,7 +2,7 @@
 /* 全局 */
 html,body{overflow-x: hidden;font-size: 16px;line-height: 1.6;}
 /* html body{margin-top: 61px;} */
-html{background-color: #F2F2F2;}
+/*html{background-color: #F2F2F2;} */
 
 i{font-style: normal;}
 /* 图标 */

data/app/controllers/educode_sales/application_controller.rb

@@ -5,6 +5,11 @@ module EducodeSales
     before_action :authenticate_request
 
 
+    def is_commissioner_above?
+      return  true  if @current_admin.is_admin?
+      ["销售总监", "副总", "生态运营总监", "方案总监", "售后总监", "课程组总监"].include? @current_admin.role.name
+    end
+
     def subject_members
       common = Common.find_by(clazz: 'staff_type', name: '课程')
       @manages = Staff.joins(:user).where(job_type: common.id.to_i).where.not(role_id: 11).map { |d| {name: d.user.real_name, value: d.id}}
@@ -15,6 +20,11 @@ module EducodeSales
       @staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11).map { |d| { value: d.id, name: d.name } }
     end
 
+    def subject_url
+      @url =  "https://data.educoder.net"
+      @admins_url = "https://data.educoder.net"
+    end
+
     def render_success
       render json: { success: true }
     end

data/app/controllers/educode_sales/business_courses_controller.rb

@@ -5,7 +5,8 @@ module EducodeSales
   # 商机交付课程
   class BusinessCoursesController < ApplicationController
     include BusinessCoursesHelper
-    before_action :subject_members
+    include? SubjectHelper
+    before_action :subject_members, :subject_url
 
     def index
       authorize! :business, BusinessDeliverSubject
@@ -13,7 +14,18 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @business_deliver = BusinessDeliverSubject.joins(business: [:school, :staff, :last_follow_up])
+          @business_deliver = BusinessDeliverSubject.all
+
+          unless is_commissioner_above?
+            business_ids = @business_deliver.pluck(:business_id)
+            last_follow_staff_business = Business.where(id: business_ids).joins(last_follow_up: [assign_follow_ups: [staff: :user]]).where("CONCAT(users.lastname, users.firstname) = '#{@current_admin.user.real_name}' ")
+
+            last_follow_staff_business_ids = last_follow_staff_business.pluck("educode_sales_businesses.id")
+            staff_business = Business.where(id: business_ids - last_follow_staff_business_ids).joins(staff: :user).where("CONCAT(users.lastname, users.firstname) = '#{@current_admin.user.real_name}' ")
+            @business_deliver = BusinessDeliverSubject.where(business_id: last_follow_staff_business_ids + staff_business.ids)
+          end
+
+          @business_deliver = @business_deliver.joins(business: [:school, :staff, :last_follow_up])
 
           # 查询条件 交付状态 state == 0 代表全部
           if params[:q] && params[:q][:state].present? && params[:q][:state] != '0'
@@ -119,7 +131,7 @@ module EducodeSales
 
           BusinessSubjectStaff.bulk_insert(:staff_id, :container_id, :container_type, :created_at, :updated_at, :category) do |d|
             params[:business][:manage_id].split(",").each do |m|
-              d.add [m.to_i, add_item.id, BusinessSubjectStaff::CONTAINER_TYPES::BUSSINESS, Time.now, Time.now, BusinessSubjectStaff::CATEGORY_TYPES::BUSINESS_MANAGE ]
+              d.add [m.to_i, add_item.id, BusinessSubjectStaff::CONTAINER_TYPES::BUSSINESS, Time.now, Time.now, BusinessSubjectStaff::CATEGORY_TYPES::BUSINESS_MANAGE]
             end
           end
 
@@ -133,18 +145,17 @@ module EducodeSales
     def select_business
       respond_to do |format|
         format.json do
-          stage_id = Common.where(clazz: '商机阶段', name: ['已签单']).pluck(:id).join(",")
+          stage_id = Common.where(clazz: '商机阶段', name: ['已签单']).take.id.to_i
           @businesses = Business.joins(:last_follow_up, :school)
-                                .where("educode_sales_businesses.NAME LIKE '%#{params[:q]}%' and educode_sales_follow_ups.stage_id IN (#{stage_id}) ")
-                                .where("educode_sales_businesses.id not in (?) ", BusinessDeliverSubject.pluck(:business_id).map(&:to_i) ) # todo 数组中包含nil会导致查询失败，无法找到数据
+                                .where("educode_sales_businesses.name LIKE '%#{params[:q]}%' and educode_sales_follow_ups.stage_id = #{stage_id} ")
+                                .where("educode_sales_businesses.id not in (?) ", BusinessDeliverSubject.pluck(:business_id).map(&:to_i)) # todo 数组中包含nil会导致查询失败，无法找到数据
                                 .select("educode_sales_businesses.*, schools.name as s_name, schools.id as s_id")
-                                .page(params[:page])
-                                .distinct
-                                .per(10)
+
+          @count = @businesses.count("educode_sales_businesses.id")
+          @businesses = @businesses.page(params[:page]).per(10)
           render json: {
             data: @businesses,
-            code: 0,
-            count: @businesses.total_count / 10
+            code: 0
           }
         end
       end
@@ -157,20 +168,34 @@ module EducodeSales
           render layout: false
         end
         format.json do
+          shixuns = BusinessSubjectShixun
+          if params[:id].present?
             business_deliver = BusinessDeliverSubject.find_by(id: params[:id])
+            shixuns = BusinessSubjectShixun.joins(:shixun, business_subject: [:business_deliver_subject, :subject]).left_joins(:last_dectect).where("educode_sales_business_deliver_subjects.id = #{business_deliver.id }")
+          elsif params[:subject_id].present?
+            shixuns = BusinessSubjectShixun.joins(:shixun, business_subject: [:business_deliver_subject, :subject]).left_joins(:last_dectect).where("educode_sales_business_subjects.id = #{params[:subject_id] }")
+          end
 
-            shixuns = BusinessSubjectShixun.joins(:shixun, business_subject: [business_deliver_subject: :business]).where("educode_sales_business_deliver_subjects.id = #{business_deliver.id }")
-
-            @count = shixuns.count
-
-            @shixuns  = shixuns.select("educode_sales_business_subject_shixuns.*, shixuns.name  s_name, shixuns.identifier s_identifier")
-                               .page(params[:page]).per(params[:limit])
-        end
+          if params[:q].present? && params[:q][:shixun_name].present?
+            shixuns = shixuns.where("shixuns.name like '%#{params[:q][:shixun_name]}%'")
+          end
+          if params[:q].present? && params[:q][:subject_name].present?
+            shixuns = shixuns.where("subjects.name like '%#{params[:q][:subject_name]}%'")
+          end
+          shixuns = shixuns.search_category(params[:q][:category]) if params[:q].present?
+          shixuns = shixuns.search_status(params[:q][:status]) if params[:q].present?
+          shixuns = shixuns.search_level(params[:q][:level]) if params[:q].present?
+          @count = shixuns.count
+
+          @shixuns = shixuns.select("educode_sales_business_subject_shixuns.*, shixuns.name  s_name, shixuns.identifier s_identifier,
+                                     subjects.name as subjects_name,subjects.identifier as subjects_identifier,
+                                     educode_sales_shixun_dectects.content dectect_content, educode_sales_shixun_dectects.date dectect_time ")
+                            .page(params[:page]).per(params[:limit])
         end
+      end
     end
 
-
-    def list_subjects # todo 接口该为 list_subjects
+    def list_subjects
       respond_to do |format|
         format.html do
           render layout: false
@@ -181,28 +206,28 @@ module EducodeSales
 
           # subject.status =>  :0 编辑中  1 审核中  2 发布
           # public: 2: 公开
-          # todo 响应参数中: 交付时间 交付单位 销售 课程经理 全部来自商机交付课程中数据 => (bussiness_deliver)
-          subjects = Subject.joins("INNER JOIN educode_sales_business_subjects bs ON subjects.id = bs.subject_id
-                                 INNER JOIN educode_sales_business_deliver_subjects e_s_b_d_s ON bs.business_deliver_subject_id = e_s_b_d_s.id and e_s_b_d_s.id = #{bussiness_deliver_id}
-                                 LEFT JOIN stage_shixuns ss ON ss.subject_id = subjects.id
-                                 LEFT JOIN shixuns s ON s.id = ss.item_id")
-          # todo 搜索  subjects.where("subjects.字段 = x") # 不需要单位搜索
+          subjects = BusinessSubject.joins("INNER JOIN subjects bs ON bs.id = educode_sales_business_subjects.subject_id
+                                            INNER JOIN educode_sales_business_deliver_subjects e_s_b_d_s ON educode_sales_business_subjects.business_deliver_subject_id = e_s_b_d_s.id and e_s_b_d_s.id = #{bussiness_deliver_id}
+                                            INNER JOIN educode_sales_businesses esb ON esb.id = educode_sales_business_subjects.business_id
+                                            LEFT JOIN educode_sales_follow_ups fu ON fu.id = esb.last_follow_up_id
+                                           ")
 
           # 搜索条件
           if params[:q].present? && params[:q][:name].present?
-            subjects = subjects.where("subjects.name like '%#{params[:q][:name]}%'")
+            subjects = subjects.where("bs.name like '%#{params[:q][:name]}%'")
           end
           if params[:q].present? && params[:q][:p_state].present?
             status = params[:q][:p_state].to_i
-            if status < 3
-              subjects = subjects.where("subjects.status = #{params[:q][:p_state]}")
+            if status == 1
+              subjects = subjects.where("bs.public = #{status}")
+            elsif [0, 2].include? status
+              subjects = subjects.where("bs.status = #{status} and public not in (1,2) ")
             else
-              subjects = subjects.where("subjects.public = 2")
+              subjects = subjects.where("bs.public = 2")
             end
           end
-          @subjects = subjects.group("subjects.id").select("subjects.identifier, subjects.status status, subjects.name name, subjects.id, subjects.public").page(params[:page]).per(params[:limit])
-          p @subjects.map { |d| d.shixuns_completed_progress }
-          @url = "https://test.educoder.net/paths/"
+          @subjects = subjects.includes(business_subject_shixuns: :shixun).select("educode_sales_business_subjects.*, bs.identifier, bs.status status, bs.name name, bs.public, IFNULL(fu.reception_at, '--') reception_at").page(params[:page]).per(params[:limit])
+
         end
       end
 

data/app/controllers/educode_sales/businesses_controller.rb

@@ -296,28 +296,28 @@ module EducodeSales
 
           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')
+            @businesses = @businesses.where("educode_sales_businesses.created_at >= ? AND educode_sales_businesses.created_at <= ?", date[0] + ' 00:00:00', 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')
+            ").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][:plan_return_date].present?
             date = params[:q][:plan_return_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.plan_return_date > ? AND educode_sales_follow_ups.plan_return_date < ?", date[0] + '00:00:00', date[1] + '23:59:59')
+            ").where("educode_sales_follow_ups.plan_return_date >= ? AND educode_sales_follow_ups.plan_return_date <= ?", date[0] + ' 00:00:00', date[1] + ' 23:59:59')
           end
         
           if params[:q].present? && params[:q][:plan_a_date].present?
             date = params[:q][:plan_a_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.plan_a_date > ? AND educode_sales_follow_ups.plan_a_date < ?", date[0] + '00:00:00', date[1] + '23:59:59')
+            ").where("educode_sales_follow_ups.plan_a_date >= ? AND educode_sales_follow_ups.plan_a_date <= ?", date[0] + ' 00:00:00', date[1] + ' 23:59:59')
           end
 
           # 根据编号获取商机
@@ -345,7 +345,7 @@ module EducodeSales
                 elsif params[:q][:source_way]  == '渠道代理'
                   sourcable_id = EducodeSales::Place.where("name like ?", "%#{params[:q][:source_name]}%").limit(20).pluck(:id)
                 elsif params[:q][:source_way]  == '客户'
-                  sourcable_id = EducodeSales::Department.where("name like ?", "%#{params[:q][:source_name]}%").limit(20).pluck(:id)
+                  sourcable_id = Department.where("name like ?", "%#{params[:q][:source_name]}%").limit(20).pluck(:id)
                 end
 
                 if sourcable_id.present?
@@ -484,7 +484,7 @@ module EducodeSales
         elsif params[:source_way]  == '渠道代理'
           params[:sourcable_type] = 'EducodeSales::Place'
         elsif params[:source_way]  == '客户'
-          params[:sourcable_type] = 'EducodeSales::Department'
+          params[:sourcable_type] = 'Department'
         else
           params[:sourcable_id] = ""
         end
@@ -572,7 +572,7 @@ module EducodeSales
         elsif params[:source_way]  == '渠道代理'
           params[:sourcable_type] = 'EducodeSales::Place'
         elsif params[:source_way]  == '客户'
-          params[:sourcable_type] = 'EducodeSales::Department'
+          params[:sourcable_type] = 'Department'
         else
           params[:sourcable_id] = ""
         end
@@ -889,6 +889,42 @@ module EducodeSales
             @businesses = @businesses.where(id: my_ids)
           end
 
+          if params[:is_area].present?
+            # 区域管理商机
+            # 排查看区域商机，需要排除掉其它人员手上的监管学校
+            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
+            @businesses = Business.joins("JOIN departments AS dp ON educode_sales_businesses.department_id = dp.id").where("dp.school_id in (?)", school_ids)
+          end
+
+          if params[:special].present?
+            # 专项商机
+            school_tag_ids = @current_admin.staff_school_tags.pluck(:school_tag_id)
+            school_ids = SchoolTagMiddle.where(school_tag_id: school_tag_ids).pluck(:school_id)
+            @businesses = Business.joins("JOIN departments AS dp ON educode_sales_businesses.department_id = dp.id").where("dp.school_id in (?)", school_ids)
+          end
+
+          if params[:delete_list].present?
+            @businesses = Business.unscoped.where(state_id: [1, 3])
+          end
+
+          if params[:plan_year].present?
+            if @current_admin.is_admin?
+              @businesses = Business
+            else
+              # 年度计划，按负责区域和专项客户类型查看对应的年度商机
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
+              if @current_admin.staff_school_tags.present?
+                # 如果设置专项客户类型，则视为专项经理，根据专项客户查看对应商机
+                school_ids += School.joins(:school_tags).where("school_tags.id in (?)", @current_admin.staff_school_tags.pluck(:school_tag_id)).pluck(:id)
+              end
+              @businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) ", school_ids.uniq)
+            end
+
+            @businesses = @businesses.joins(:last_follow_up).where("educode_sales_follow_ups.plan_a_date > :year OR educode_sales_follow_ups.plan_return_date > :year OR educode_sales_follow_ups.invitation_at > :year", year: Time.now.beginning_of_year)
+          end
+
           @businesses = @businesses
           if params[:name].present? # && params[:name] != "(销售态势-" + @year + "-已中标商机)" && params[:name] != "(销售态势-" + @year + "-已签单商机)" && params[:name] != "(销售态势-" + @year + "-已回款商机)" && params[:name] != "(销售态势-" + @year + "-现有商机)"&&  params[:name] != "(销售态势-" + @year + "-应收款商机)"
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:name]}%")

data/app/controllers/educode_sales/contracts_controller.rb

@@ -32,6 +32,9 @@ module EducodeSales
           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
+          if params[:date_at].present? && params[:date_at] != '全部'
+            gon.bidded_date = Time.new(params[:date_at]).beginning_of_year.strftime("%Y-%m-%d") + " - " + Time.new(params[:date_at]).end_of_year.strftime("%Y-%m-%d")
+          end
         end
         format.json do
           @businesses = Business
@@ -279,6 +282,9 @@ module EducodeSales
       @staffs = staffs.map { |d| [d.user.real_name, d.id]}
       role = Role.find_by(name: '售后工程师')
       @after_sales_staffs = Staff.joins(:user).where(role_id: role.id).map { |d| [d.user.real_name, d.id]}
+      if params[:date_at].present? && params[:date_at] != '全部'
+        gon.bidded_date = Time.new(params[:date_at]).beginning_of_year.strftime("%Y-%m-%d") + " - " + Time.new(params[:date_at]).end_of_year.strftime("%Y-%m-%d")
+      end
     end
 
     def new_follow_up

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -14,6 +14,10 @@ module EducodeSales
           gon.staff_id = @current_admin.id
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           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 } }
+
+          if params[:date_at].present? && params[:date_at] != '全部'
+            gon.date = Time.new(params[:date_at]).beginning_of_year.strftime("%Y-%m-%d") + " - " + Time.new(params[:date_at]).end_of_year.strftime("%Y-%m-%d")
+          end
         end
         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")
@@ -45,7 +49,7 @@ module EducodeSales
 
           if params[:q].present? && params[:q][:date_at].present?
             date = params[:q][:date_at].split(" - ")
-            @money_plan_records = @money_plan_records.where("date_at BETWEEN ? AND ?", date[0], date[1])
+            @money_plan_records = @money_plan_records.where("date_at BETWEEN ? AND ?", date[0] + ' 00:00:00', date[1] + ' 23:59:59')
           end
           if params[:q].present? && params[:q][:state].present?
             if params[:q][:state] == '已认领'
@@ -207,7 +211,7 @@ module EducodeSales
             #   money.save
             # end
              # 上次的回款计划的跟进也要同步到最新的跟进id，不然回款计划列表会找不到
-             EducodeSales::MoneyPlan.where(business_id: d.id, id: params[:money_plan_ids]).update_all(follow_up_id: follow_up.id)
+             EducodeSales::MoneyPlan.where(business_id: d.id, follow_up_id: last_follow_up.id).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

@@ -80,6 +80,9 @@ module EducodeSales
           gon.edit_money_plan = can?(:update, EducodeSales::MoneyPlan)
           gon.edit_money_plan_self = can?(:update_self, EducodeSales::MoneyPlan)
           gon.staff_id = @current_admin.id
+          if params[:date_at].present? && params[:date_at] != '全部'
+            gon.date = Time.new(params[:date_at]).beginning_of_year.strftime("%Y-%m-%d") + " - " + Time.new(params[:date_at]).end_of_year.strftime("%Y-%m-%d")
+          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