educode_sales 1.10.48 → 1.10.58

data/app/controllers/educode_sales/subjects_controller.rb

@@ -0,0 +1,213 @@
+# frozen_string_literal: true
+
+module EducodeSales
+  include SubjectHelper
+
+  # 实践课程管理
+  class SubjectsController < ApplicationController
+    before_action :subject_members, :subject_url
+
+    def index
+      authorize! :subject, BusinessDeliverSubject
+      respond_to do |format|
+        format.html do
+        end
+        format.json do
+
+          if is_commissioner_above?
+            business_subject = BusinessSubject
+          else
+            deliver_staffs = BusinessSubject.joins(business_deliver_subject: [manages: :staff])
+            business_subject_ids  = deliver_staffs.where("educode_sales_staffs.id = #{@current_admin.id} ").ids
+            subject_staffs = BusinessSubject.where(id: BusinessSubject.ids - deliver_staffs.ids).joins(manages: :staff).where("educode_sales_staffs.id = #{@current_admin.id} ")
+            business_subject = BusinessSubject.where(id: business_subject_ids + subject_staffs.ids )
+          end
+
+
+          business_subject = business_subject.joins(:subject).left_joins(business_deliver_subject: [:manages, business: [:last_follow_up]])
+          if params[:q] && params[:q][:business_name].present?
+            business_subject = business_subject.joins(:business).where("educode_sales_businesses.name like '%#{params[:q][:business_name]}%' ")
+          end
+          # 查询条件 实践课程名称
+          if params[:q] && params[:q][:subjects_name].present?
+            business_subject = business_subject.where("subjects.name like '%#{params[:q][:subjects_name]}%'")
+          end
+          # 查询条件 时间
+          if params[:q] && params[:q][:time].present?
+            start_time = params[:q][:time].split(" - ")[0]
+            end_time = params[:q][:time].split(" - ")[-1]
+            business_subject = business_subject.where("educode_sales_business_subjects.deliver_date BETWEEN '#{start_time}' AND '#{end_time}' OR
+                                                       educode_sales_follow_ups.reception_at BETWEEN'#{start_time}' AND '#{end_time}'")
+          end
+          business_subject_schools = {}
+          business_subject_manges = {}
+          business_subject_staffs = {}
+          BusinessSubject.includes(:school, :manages, :subject, :staffs, business_deliver_subject: [:manages, business: [:school, last_follow_up: :assign_follow_ups] ]).find_each do |d|
+            b_d_s = d.business_deliver_subject
+
+            b_d_s.present? ? business_subject_schools.merge!({ "#{d.id}": d.business.school.name }) : business_subject_schools.merge!({"#{d.id}": d.school_name })
+            b_d_s.present? ? business_subject_manges.merge!({ "#{d.id}":  b_d_s.subject_manages}) : business_subject_manges.merge!({"#{d.id}": d.manges_name })
+            b_d_s.present? ? business_subject_staffs.merge!({ "#{d.id}": d.business.staff_name }) : business_subject_staffs.merge!({"#{d.id}": d.staffs_name })
+
+          end
+          @business_subject_schools = business_subject_schools.stringify_keys
+          @business_subject_staffs = business_subject_staffs.stringify_keys
+          @business_subject_manges = business_subject_manges.stringify_keys
+          business_subject = business_subject.select("subjects.name s_name,
+                                                      subjects.identifier s_identifier,
+                                                      subjects.status status,
+                                                      subjects.public public,
+                                                      educode_sales_business_subjects.id,
+                                                      IFNULL(educode_sales_follow_ups.reception_at, educode_sales_business_subjects.deliver_date) deliver_date,
+                                                      IFNULL(educode_sales_businesses.name, '--' ) b_name
+                                                      ")
+          @count = business_subject.count("educode_sales_business_subjects.id")
+          @business_subject = business_subject.page(params[:page]).per(params[:limit])
+
+        end
+      end
+    end
+
+    def new
+      authorize! :subject, BusinessDeliverSubject
+      # staffs = Staff.where.not(role_id: 11).includes(:user)
+      gon.staffs = @manages
+      render layout: false
+    end
+
+    def edit
+      authorize! :subject, BusinessDeliverSubject
+      if params[:id]
+        business_subject = BusinessSubject.find(params[:id])
+        @item = business_subject.subject
+        @select = @item.shixuns.map { |item| { value: item.id, name: item.name } }
+        @id = business_subject.id
+        @school_id = business_subject.school_id
+        @default_select = BusinessSubjectShixun.where("business_subject_id = #{params[:id]}")
+                                               .select(:shixun_id)
+                                               .map { |item| item.shixun_id }
+        render layout: false
+      end
+    end
+
+    def create
+      authorize! :subject, BusinessDeliverSubject
+      # 开启事务
+      ActiveRecord::Base.transaction do
+        subject = Subject.where.not(id: BusinessSubject.pluck(:subject_id) ).find_by(id: params[:subject_id])
+        if subject.present?
+          attr = {
+            deliver_date: params[:deliver_date],
+            school_id: params[:school_id],
+            subject_id: subject.id
+          }
+          new_object = BusinessSubject.create(attr)
+
+          new_object.add_subject_shixuns(params[:shixun_ids].split(',').map(&:to_i))
+
+
+          BusinessSubjectStaff.bulk_insert(:staff_id, :container_id, :container_type, :created_at, :updated_at, :category) do |d|
+            params[:manage_id].split(",").each do |m|
+              d.add [m.to_i, new_object.id, BusinessSubjectStaff::CONTAINER_TYPES::SUBJECT, Time.now, Time.now, BusinessSubjectStaff::CATEGORY_TYPES::SUBJECT_MANAGE ]
+            end
+            params[:sale_id].split(",").each do |s|
+              d.add [s.to_i, new_object.id, BusinessSubjectStaff::CONTAINER_TYPES::SUBJECT, Time.now, Time.now, BusinessSubjectStaff::CATEGORY_TYPES::SUBJECT_STAFF ]
+            end
+          end
+
+          render_success
+        else
+          render_failure("操作失败")
+        end
+      end
+    end
+
+    def update
+      authorize! :subject, BusinessDeliverSubject
+      # 开启事务
+      ActiveRecord::Base.transaction do
+        business_subject = BusinessSubject.find_by(id: params[:id])
+
+        if business_subject
+          new_shixun_ids = params[:shixun_ids].split(',').map(&:to_i)
+          old_shixun_ids = business_subject.business_subject_shixuns.pluck(:shixun_id)
+
+          # 需要删除的科目id
+          change_shixuns = old_shixun_ids - new_shixun_ids
+          add_shixuns = new_shixun_ids - old_shixun_ids
+
+          # 取消关联
+          business_subject.business_subject_shixuns.where(shixun_id: change_shixuns).update_all(business_subject_id: nil)
+
+          # 创建关联
+          business_subject.add_subject_shixuns(add_shixuns)
+
+          render_success
+        else
+          render_failure("操作失败")
+        end
+
+      end
+    end
+
+    def shixun_list
+      respond_to do |format|
+        format.json do
+          @list = Shixun.where(hidden: 0).where.not(id: BusinessSubjectShixun.joins(:business_subject).pluck(:shixun_id) ) # 1先创建实践项目下，通过实践课程无法选该
+          if params[:q].present?
+            @list = @list.where("name like '%#{params[:q]}%'").page(params[:page]).per(10)
+          end
+          if params[:subject_id].present?
+            @list = @list.joins(:stage_shixuns).where("subject_id = #{params[:subject_id]}")
+          end
+          render json: {
+            data: @list.map { |item| { value: item[:id], name: item[:name] } },
+            code: 0
+          }
+        end
+      end
+    end
+
+    def search_subjects
+      respond_to do |format|
+        format.json do
+          @subjects = Subject.unhidden.where.not(id: BusinessSubject.pluck(:subject_id)).where("name like '%#{params[:q]}%' ").page(params[:page]).per(10)
+          render json: {
+            data: @subjects.map { |item| { value: item[:id], name: item[:name] } },
+            code: 0,
+            count: @subjects.total_count / 10
+          }
+        end
+      end
+    end
+
+    def list_shixuns
+        @shixuns = BusinessSubjectShixun.left_joins(:last_dectect)
+                                        .left_joins(:shixun)
+                                        .where("business_subject_id = #{params[:id]}")
+
+        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][:level].present? && params[:q][:level].to_i != 0
+          @shixuns = @shixuns.where(level: params[:q][:level])
+        end
+        # 项目状态 0 全部
+        if params[:q].present? && params[:q][:status].present? && params[:q][:status].to_i != 0
+          @shixuns = @shixuns.where(shixun_status: params[:q][:status])
+        end
+        if params[:q].present? && params[:q][:category].present? && params[:q][:category].to_i != 0
+          @shixuns = @shixuns.where(category: params[:q][:category])
+        end
+        @shixuns = @shixuns.select("educode_sales_business_subject_shixuns.*,
+                                    shixuns.name as shixun_name,
+                                    shixuns.identifier,
+                                    educode_sales_shixun_dectects.created_at as shixun_dectects_time,
+                                    educode_sales_shixun_dectects.content as dectects_content")
+                           .page(params[:page])
+                           .per(params[:limit])
+      render layout: false
+    end
+
+  end
+end

data/app/helpers/educode_sales/application_helper.rb

@@ -9,6 +9,16 @@ module EducodeSales
       end
     end
 
+    def handled_data(item)
+      item.blank? ? "--" : item
+    end
+
+    def handled_time_data(item)
+      item.blank? ? "--" : item.strftime("%Y-%m-%d")
+    end
+    def handled_time_data_accurate(item)
+      item.blank? ? "--" : item.strftime("%Y-%m-%d %H:%M:%S")
+    end
     def url_to_avatar(source)
       return "" if source.blank?
       if File.exist?(disk_filename(source&.class, source&.id)) && File.file?(disk_filename(source&.class, source&.id))

data/app/helpers/educode_sales/business_courses_helper.rb

@@ -0,0 +1,60 @@
+module EducodeSales
+  module BusinessCoursesHelper
+
+    def real_shixun_category(categor)
+      case categor.to_i
+      when 1
+        "管培"
+      when 2
+        "全职"
+      when 3
+        "专职"
+      else
+        "管培"
+      end
+    end
+
+    def real_shixun_level(level)
+      case level.to_i
+      when 1
+        "不明确"
+      when 2
+        "重要紧急"
+      when 3
+        "重要不紧急"
+      when 4
+        "不重要紧急"
+      when 5
+        "不重要不紧急"
+      else
+        "不明确"
+      end
+    end
+    # 项目状态: 待建设(constructed) 已签协议(signed) 建设中(construction) 审核中(review)，返修中(repair) 已内部公开(public)， 已公开发布(published) 已经付费(paid)
+    def real_shixun_status(status)
+      case status.to_i
+      when 1
+        "待建设"
+      when 2
+        "已签协议"
+      when 3
+        "建设中"
+      when 4
+        "审核中"
+      when 5
+        "返修中"
+      when 6
+        "已内部发布"
+      when 7
+        "已公开发布"
+      when 8
+        "已付费用"
+      when 9
+        "审核通过"
+      end
+
+    end
+
+
+  end
+end

data/app/helpers/educode_sales/sale_trends_helper.rb

@@ -1,7 +1,7 @@
 module EducodeSales
   module SaleTrendsHelper
     NAMES = %w[计划投标额 计划投标额累计 实际中标额 实际中标额累计]
-    RETURN_NAMES = %w[实际回款额 计划回款额 实际回款 计划回款额-全部 计划回款额-o类]
+    RETURN_NAMES = %w[计划回款额 计划回款额-全部 实际回款额 实际回款额-累计 计划回款额-O类]
 
     def goal_forecast_quarter(labels, selects, staff_id = nil, property)
       plan_get = plan_get(staff_id, labels, "quarter", property)
@@ -349,7 +349,7 @@ module EducodeSales
                    week = d.split("-").last
                    year = d.split("-").first
                    yearweek = "#{year}#{week}".to_i
-                   actual_return[yearweek].to_f.round(3)
+                   plan_return[yearweek].to_f.round(3)
                  end
                elsif select == RETURN_NAMES[1]
                  arr = labels.map do |d|
@@ -367,12 +367,13 @@ module EducodeSales
                    actual_return[yearweek].to_f.round(3)
                  end
                elsif select == RETURN_NAMES[3]
-                 labels.map do |d|
+                 arr = labels.map do |d|
                    week = d.split("-").last
                    year = d.split("-").first
                    yearweek = "#{year}#{week}".to_i
-                   plan_return[yearweek].to_f.round(3)
+                   actual_return[yearweek].to_f.round(3)
                  end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
                elsif select == RETURN_NAMES[4]
                  arr = labels.map do |d|
                    week = d.split("-").last
@@ -382,16 +383,15 @@ module EducodeSales
                  end
                  arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
                end
-        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[2]
                  'bar'
                else
                  "line"
                end
-        backgroundColor = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
-                            'rgba(54, 162, 235, 1)'
-                          else
+        backgroundColor = if select == RETURN_NAMES[0] || select == RETURN_NAMES[2]
                             SaleTrend::COLORS[i]
-                            'rgba(54, 162, 235, 0)'
+                          else
+                            'rgba(54, 162, 235, 0.2)'
                           end
         {
             type: type,
@@ -405,11 +405,11 @@ module EducodeSales
 
       hash_a = {
           labels: labels,
-          datasets: [datasets[0], datasets[1]]
+          datasets: [datasets[0], datasets[2]]
       }
       hash_b = {
           labels: labels,
-          datasets: [datasets[2], datasets[3], datasets[4]]
+          datasets: [datasets[1], datasets[4], datasets[3]]
       }
       [hash_a, hash_b]
     end
@@ -423,7 +423,7 @@ module EducodeSales
                  labels.map do |d|
                    quarter = d.split("-").last.to_i
                    year = d.split("-").first.to_i
-                   actual_return[[year, quarter]]&.pluck(:amount)&.reject(&:blank?)&.sum.to_f.round(3)
+                   plan_return[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
                  end
                elsif select == RETURN_NAMES[1]
                  arr = labels.map do |d|
@@ -439,11 +439,12 @@ module EducodeSales
                    actual_return[[year, quarter]]&.pluck(:amount)&.reject(&:blank?)&.sum.to_f.round(3)
                  end
                elsif select == RETURN_NAMES[3]
-                 labels.map do |d|
+                 arr = labels.map do |d|
                    quarter = d.split("-").last.to_i
                    year = d.split("-").first.to_i
-                   plan_return[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                   actual_return[[year, quarter]]&.pluck(:amount)&.reject(&:blank?)&.sum.to_f.round(3)
                  end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
                elsif select == RETURN_NAMES[4]
                  arr = labels.map do |d|
                    quarter = d.split("-").last.to_i
@@ -452,16 +453,15 @@ module EducodeSales
                  end
                  arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
                end
-        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[2]
                  'bar'
                else
                  "line"
                end
-        backgroundColor = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
-                            'rgba(54, 162, 235, 1)'
-                          else
+        backgroundColor = if select == RETURN_NAMES[0] || select == RETURN_NAMES[2]
                             SaleTrend::COLORS[i]
-                            'rgba(54, 162, 235, 0)'
+                          else
+                            'rgba(54, 162, 235, 0.2)'
                           end
         {
             type: type,
@@ -475,11 +475,11 @@ module EducodeSales
 
       hash_a = {
           labels: labels,
-          datasets: [datasets[0], datasets[1]]
+          datasets: [datasets[0], datasets[2]]
       }
       hash_b = {
           labels: labels,
-          datasets: [datasets[2], datasets[3], datasets[4]]
+          datasets: [datasets[1], datasets[4], datasets[3]]
       }
       [hash_a, hash_b]
     end
@@ -492,47 +492,47 @@ module EducodeSales
       datasets = selects.map.with_index do |select, i|
         data = if select == RETURN_NAMES[0]
                  labels.map do |d|
-                   quarter = d.split("-").last.to_i
+                   month = d.split("-").last.to_i
                    year = d.split("-").first.to_i
-                   actual_return[[year, quarter]]&.pluck(:amount)&.reject(&:blank?)&.sum.to_f.round(3)
+                   plan_return[[year, month]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
                  end
                elsif select == RETURN_NAMES[1]
                  arr = labels.map do |d|
-                   quarter = d.split("-").last.to_i
+                   month = d.split("-").last.to_i
                    year = d.split("-").first.to_i
-                   plan_return[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                   plan_return[[year, month]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
                  end
                  arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
                elsif select == RETURN_NAMES[2]
                  labels.map do |d|
-                   quarter = d.split("-").last.to_i
+                   month = d.split("-").last.to_i
                    year = d.split("-").first.to_i
-                   actual_return[[year, quarter]]&.pluck(:amount)&.reject(&:blank?)&.sum.to_f.round(3)
+                   actual_return[[year, month]]&.pluck(:amount)&.reject(&:blank?)&.sum.to_f.round(3)
                  end
                elsif select == RETURN_NAMES[3]
-                 labels.map do |d|
-                   quarter = d.split("-").last.to_i
+                 arr = labels.map do |d|
+                   month = d.split("-").last.to_i
                    year = d.split("-").first.to_i
-                   plan_return[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                   actual_return[[year, month]]&.pluck(:amount)&.reject(&:blank?)&.sum.to_f.round(3)
                  end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
                elsif select == RETURN_NAMES[4]
                  arr = labels.map do |d|
-                   quarter = d.split("-").last.to_i
+                   month = d.split("-").last.to_i
                    year = d.split("-").first.to_i
-                   plan_return_by_o[[year, quarter]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
+                   plan_return_by_o[[year, month]]&.pluck(:plan_return_money)&.reject(&:blank?)&.sum.to_f.round(3)
                  end
                  arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
                end
-        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[2]
                  'bar'
                else
                  "line"
                end
-        backgroundColor = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
-                            'rgba(54, 162, 235, 1)'
-                          else
+        backgroundColor = if select == RETURN_NAMES[0] || select == RETURN_NAMES[2]
                             SaleTrend::COLORS[i]
-                            'rgba(54, 162, 235, 0)'
+                          else
+                            'rgba(54, 162, 235, 0.2)'
                           end
         {
             type: type,
@@ -546,11 +546,11 @@ module EducodeSales
 
       hash_a = {
           labels: labels,
-          datasets: [datasets[0], datasets[1]]
+          datasets: [datasets[0], datasets[2]]
       }
       hash_b = {
           labels: labels,
-          datasets: [datasets[2], datasets[3], datasets[4]]
+          datasets: [datasets[1], datasets[4], datasets[3]]
       }
       [hash_a, hash_b]
     end
@@ -561,29 +561,29 @@ module EducodeSales
       plan_return_by_o = plan_return_by_o(staff_id, labels, "year", property)
       datasets = selects.map.with_index do |select, i|
         data = if select == RETURN_NAMES[0]
-                 labels.map { |d| actual_return[d.to_i] || 0 }
+                 labels.map { |d| plan_return[d.to_i] || 0 }
                elsif select == RETURN_NAMES[1]
                  arr = labels.map { |d| plan_return[d.to_i] || 0 }
                  arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
                elsif select == RETURN_NAMES[2]
                  labels.map { |d| actual_return[d.to_i] || 0 }
                elsif select == RETURN_NAMES[3]
-                 labels.map { |d| plan_return[d.to_i] || 0 }
+                 arr = labels.map { |d| actual_return[d.to_i] || 0 }
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
                elsif select == RETURN_NAMES[4]
                  arr = labels.map { |d| plan_return_by_o[d.to_i] || 0 }
                  arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
                end
 
-        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[1]
+        type = if select == RETURN_NAMES[0] || select == RETURN_NAMES[2]
                  'bar'
                else
                  "line"
                end
-        backgroundColor = if RETURN_NAMES[0] || select == RETURN_NAMES[1]
-                            'rgba(54, 162, 235, 1)'
-                          else
+        backgroundColor = if select == RETURN_NAMES[0] || select == RETURN_NAMES[2]
                             SaleTrend::COLORS[i]
-                            'rgba(54, 162, 235, 0)'
+                          else
+                            'rgba(54, 162, 235, 0.2)'
                           end
         {
             type: type,
@@ -597,11 +597,11 @@ module EducodeSales
 
       hash_a = {
           labels: labels,
-          datasets: [datasets[0], datasets[1]]
+          datasets: [datasets[0], datasets[2]]
       }
       hash_b = {
           labels: labels,
-          datasets: [datasets[2], datasets[3], datasets[4]]
+          datasets: [datasets[1], datasets[4], datasets[3]]
       }
       [hash_a, hash_b]
     end
@@ -725,7 +725,7 @@ module EducodeSales
                    time_range.last.split("-").first + "-12-31"
                  end
       staff_id = staff_id.present? ? Array(staff_id) : nil
-      data = Business.joins(:last_follow_up)
+      data = Business.joins(:last_follow_up).where("educode_sales_businesses.deleted_at is null")
                  .where("educode_sales_follow_ups.plan_return_date >= ? and educode_sales_follow_ups.plan_return_date <= ?", start_time, end_time)
       if staff_id.present?
         data = data.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
@@ -773,14 +773,14 @@ module EducodeSales
                    time_range.last.split("-").first + "-12-31"
                  end
       staff_id = staff_id.present? ? Array(staff_id) : nil
-      data = MoneyPlanRecord.joins(business: [department: [school: :school_tags]]).where("educode_sales_money_plan_records.date_at >= ? and educode_sales_money_plan_records.date_at <= ?", start_time, end_time)
+      data = MoneyPlanRecord.where("educode_sales_money_plan_records.date_at >= ? and educode_sales_money_plan_records.date_at <= ?", start_time, end_time)
       if staff_id.present?
         data = data.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").
             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 = ?)", staff_id, staff_id)
       end
       if property.present?
-        data = data.where("school_tags.id = ?", property)
+        data = data.joins(business: [department: [school: :school_tags]]).where("school_tags.id = ?", property)
       end
       case type
       when "week"
@@ -820,7 +820,7 @@ module EducodeSales
                    time_range.last.split("-").first + "-12-31"
                  end
       staff_id = staff_id.present? ? Array(staff_id) : nil
-      data = Business.joins(:last_follow_up).where("educode_sales_businesses.clazz_id = ?", clazz_id)
+      data = Business.joins(:last_follow_up).where("educode_sales_businesses.deleted_at is null").where("educode_sales_businesses.clazz_id = ?", clazz_id)
                  .where("educode_sales_follow_ups.plan_return_date >= ? and educode_sales_follow_ups.plan_return_date <= ?", start_time, end_time)
       if staff_id.present?
         data = data.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

data/app/helpers/educode_sales/subject_helper.rb

@@ -0,0 +1,33 @@
+module EducodeSales
+  module SubjectHelper
+
+
+    def status(d)
+      d.public == 2 ? "已公开" : d.public == 1 ? "待审核" : d.status == 2 ? "已发布" : "编辑中"
+    end
+
+    def school_name(item)
+      item.business ? item.business.school.name : item.school_name
+    end
+
+    # def deliver_date(item)
+    #   item.business ? item.business.p_course_time : item.deliver_date.strft审核中ime("%Y-%m-%d")
+    # end
+
+
+    # def b_name(item)
+    #   item.business ? item.business.name : ''
+    # end
+
+    def staffs(item)
+      item.business ? item.business.staff.name : item.staffs_name
+    end
+
+    def manges(item)
+      item.business ? item.business.business_deliver_subjects.take.subject_manages : item.manges_name
+    end
+
+
+
+  end
+end

data/app/models/educode_sales/business.rb

@@ -18,6 +18,7 @@ module EducodeSales
     has_many :business_levels, dependent: :destroy
     has_many :business_watches, dependent: :destroy
     has_many :business_histories, dependent: :destroy
+    has_many :business_deliver_subjects, dependent: :destroy # 商机交付课程
     has_many :money_plans
 
     has_one :invoice_apply
@@ -35,6 +36,7 @@ module EducodeSales
     # 关联关注
     has_many :users, :class_name => 'EducodeSales::BusinessRelationShip', foreign_key: 'business_id', :dependent => :destroy
 
+    after_update :change_diliver
     # 每次查询时 默认的查询条件
     default_scope -> { where(deleted_at: nil) }
 
@@ -75,6 +77,26 @@ module EducodeSales
         '应收款' => ['已中标','已签单','已验收','回款中', '服务中','已结束']
       }[type]
     end
+
+
+    # 创建商机交付课程数据
+    def change_diliver
+
+      # if previous_changes["last_follow_up_id"].present?
+      #   last_clazz_id = previous_changes["last_follow_up_id"][-1]
+      #   common_type = FollowUp.find_by(id: last_clazz_id)&.stage&.name == "已中标"
+      #   BusinessDeliverSubject.find_or_create_by(business_id: self.id) if common_type
+      # end
+    end
+
+    def school_name
+      department&.school&.name || "--"
+    end
+
+    def staff_name
+      last_follow_up&.assign_follow_ups.present? ? (last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : staff&.user&.real_name
+    end
+
   end
 
 end