educode_sales 1.10.49 → 1.10.58

data/app/controllers/educode_sales/subjects_controller.rb

@@ -5,7 +5,7 @@ module EducodeSales
 
   # 实践课程管理
   class SubjectsController < ApplicationController
-    before_action :subject_members
+    before_action :subject_members, :subject_url
 
     def index
       authorize! :subject, BusinessDeliverSubject
@@ -13,11 +13,20 @@ module EducodeSales
         format.html do
         end
         format.json do
-          # d.last_follow_up&.assign_follow_ups.present? ? (d.last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : d.staff&.user&.real_name
-          business_subject = BusinessSubject.joins(:subject).left_joins(business_deliver_subject: [:manages, business: [:last_follow_up]])
-          if params[:q] && params[:q][:shixun].present?
-            business_subject = business_subject.joins("INNER JOIN educode_sales_business_subject_shixuns ON educode_sales_business_subject_shixuns.business_subject_id = educode_sales_business_subjects.id")
-                                    .where("educode_sales_business_subject_shixuns.name like '%#{params[:q][:shixun]}%'")
+
+          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?
@@ -30,23 +39,22 @@ module EducodeSales
             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] ]).each do |d|
+          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_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}": "--" }) # 先暂时处理
+            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,
@@ -95,7 +103,7 @@ module EducodeSales
           }
           new_object = BusinessSubject.create(attr)
 
-          subject.add_subject_shixuns(params[:shixun_ids].split(',').map(&:to_i))
+          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|
@@ -145,7 +153,7 @@ module EducodeSales
     def shixun_list
       respond_to do |format|
         format.json do
-          @list = Shixun.unhidden.where.not(id: BusinessSubjectShixun.joins(:business_subject).pluck(:shixun_id) ) # 1先创建实践项目下，通过实践课程无法选该实践项目
+          @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
@@ -174,9 +182,10 @@ module EducodeSales
     end
 
     def list_shixuns
-      if params[:id].present?
-        @shixuns = BusinessSubjectShixun.where("business_subject_id = #{params[:id]}")
-                                        .joins(:shixun)
+        @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
@@ -191,10 +200,12 @@ module EducodeSales
           @shixuns = @shixuns.where(category: params[:q][:category])
         end
         @shixuns = @shixuns.select("educode_sales_business_subject_shixuns.*,
-                                                shixuns.name as shixun_name")
+                                    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])
-      end
       render layout: false
     end
 

data/app/helpers/educode_sales/application_helper.rb

@@ -16,7 +16,9 @@ module EducodeSales
     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

@@ -1,20 +1,19 @@
 module EducodeSales
   module BusinessCoursesHelper
 
-    def real_shixun_type(type)
-      case type.to_i
+    def real_shixun_category(categor)
+      case categor.to_i
       when 1
         "管培"
       when 2
-        "专职"
-      when 3
         "全职"
+      when 3
+        "专职"
       else
         "管培"
       end
     end
 
-
     def real_shixun_level(level)
       case level.to_i
       when 1
@@ -22,7 +21,7 @@ module EducodeSales
       when 2
         "重要紧急"
       when 3
-        "建设重要不紧急中"
+        "重要不紧急"
       when 4
         "不重要紧急"
       when 5
@@ -31,6 +30,30 @@ module EducodeSales
         "不明确"
       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

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

@@ -2,12 +2,16 @@ 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.strftime("%Y-%m-%d")
+    #   item.business ? item.business.p_course_time : item.deliver_date.strft审核中ime("%Y-%m-%d")
     # end
 
 

data/app/models/educode_sales/business.rb

@@ -82,11 +82,11 @@ module EducodeSales
     # 创建商机交付课程数据
     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
+      # 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

data/app/models/educode_sales/business_deliver_subject.rb

@@ -9,17 +9,18 @@ module EducodeSales
     # constructed:待建设， signed: 已签协议，construction: 建设中，completed: 已完成，delivered: 已交付, accepted: 已验收
     enum status: { constructed:1, signed:2, construction: 3, completed:4, delivered: 5, accepted: 6 }
 
+    scope :undelivered, -> {where.not(status: "delivered")}
     # 实践课程完成统计
     def subject_competed_count
       all_count = subjects.count
-      completed_count = subjects.where("subjects.status = 2 and subjects.public = 2").count
+      completed_count = subjects.where("subjects.status = 2 or subjects.public = 2").count
 
       " #{completed_count} / #{all_count} "
     end
 
     # 实训项目完成进度
     def shixun_competed_count
-      " #{subjects.joins(:shixuns).where("shixuns.status =2 and shixuns.public = 2").count} / #{subjects.joins(:shixuns).count} "
+      " #{business_subjects.joins(:business_subject_shixuns).where("educode_sales_business_subject_shixuns.shixun_status in (6,7,8)").count } / #{business_subjects.joins(:business_subject_shixuns).count} "
     end
 
     # 课程经理

data/app/models/educode_sales/business_subject.rb

@@ -12,7 +12,13 @@ module EducodeSales
 
     # 销售名称
     def staffs_name
-      staffs.joins(staff: :user).pluck("CONCAT(users.lastname, users.firstname) ").join("，")
+      staff_names = BusinessSubjectStaff.joins(staff: :user)
+                          .where("educode_sales_business_subject_staffs.category = #{ BusinessSubjectStaff::CATEGORY_TYPES::SUBJECT_STAFF } and educode_sales_business_subject_staffs.container_id = #{self.id} and
+                                  educode_sales_business_subject_staffs.container_type = #{BusinessSubjectStaff::CONTAINER_TYPES::SUBJECT} ")
+                          .pluck("DISTINCT CONCAT(users.lastname, users.firstname) ")
+                          .join("，")
+      # staffs.joins(staff: :user).pluck("CONCAT(users.lastname, users.firstname) ").join("，")
+      staff_names
     end
 
     # 课程经理名称
@@ -22,7 +28,7 @@ module EducodeSales
 
     # 实训完成统计
     def shixun_compeled_count
-      " #{business_subject_shixuns.joins(:shixun).where("shixuns.status=2 and shixuns.public = 2").count}  / #{business_subject_shixuns.count}"
+      " #{business_subject_shixuns.where("educode_sales_business_subject_shixuns.shixun_status in (6,7,8)").count}  / #{business_subject_shixuns.count}"
     end
 
     def school_name
@@ -48,7 +54,7 @@ module EducodeSales
 
 
     def add_subject_shixuns(shixun_ids=[])  # 1先创建实践项目下，通过实践课程无法选该实践项目
-      shixuns = Shixun.where.not(id: BusinessSubjectShixun.joins(:business_subject).pluck(:shixun_id)).unhidden # 1先创建实践项目下，通过实践课程无法选该实践项目
+      shixuns = Shixun.where.not(id: BusinessSubjectShixun.joins(:business_subject).pluck(:shixun_id)) # 1先创建实践项目下，通过实践课程无法选该实践项目
       shixun_ids.each do |item|
         now_shixun = shixuns.find_by(id: item)
         if now_shixun.present?

data/app/models/educode_sales/business_subject_shixun.rb

@@ -5,39 +5,68 @@ module EducodeSales
     belongs_to :school, optional: true
     belongs_to :shixun, optional: true
     has_many :staffs, as: :container, dependent: :destroy, class_name: "EducodeSales::BusinessSubjectStaff"
+    has_many :shixun_members, as: :container, dependent: :destroy, class_name: "EducodeSales::BusinessSubjectStaff"
+    has_many :shixun_producer, ->{ shixun_producer }, as: :container, dependent: :destroy, class_name: "EducodeSales::BusinessSubjectStaff"
     belongs_to :last_dectect, foreign_key: :shixun_dectect_id, class_name: "EducodeSales::ShixunDectect", optional: true
 
     module CATEGORY_TYPE
       TRAINING = 1 # 管培
-      WORKER = 2  # 全职
+      WORKER = 2 # 全职
       PLURALIST = 3 # 兼职
     end
 
+    scope :search_type, ->(type) {where(shixun_type:  type.to_i) if type.to_i != 0}
+    scope :search_level, ->(level) {where(level:  level.to_i) if level.to_i != 0}
+    scope :search_status, ->(status) {where(shixun_status:  status.to_i) if status.to_i != 0}
+    scope :search_category, ->(category) {where(category:  category.to_i) if category.to_i != 0}
+    scope :training, -> {where(category:  CATEGORY_TYPE::TRAINING)}
+    scope :worker, -> {where(category:  CATEGORY_TYPE::WORKER)}
+    scope :pluralist, -> {where(category:  CATEGORY_TYPE::PLURALIST)}
+    scope :completed, -> {where(shixun_status:  [6,7,8])}
+    scope :un_completed, -> {where.not(shixun_status:  [6,7,8])}
     # 项目状态: 待建设(constructed) 已签协议(signed) 建设中(construction) 审核中(review)，返修中(repair) 已内部公开(public)， 已公开发布(published) 已经付费(paid)
-    # enum status: { constructed: 1, signed: 2, construction: 3, review: 4, repair: 5, public: 6, published: 7,paid: 8}
+    # enum shixun_status: { constructed: 1, signed: 2, construction: 3, review: 4, repair: 5, public: 6, published: 7,paid: 8}
 
     def shixun_manages
-      staffs.joins(staff: :user).where(category:BusinessSubjectStaff::CATEGORY_TYPES::SHIXUN_MANAGE).pluck("CONCAT(users.lastname, users.firstname) ").join("，")
+      staffs.joins(staff: :user).where(category: BusinessSubjectStaff::CATEGORY_TYPES::SHIXUN_MANAGE).pluck("CONCAT(users.lastname, users.firstname) ").join("，")
     end
+
     def shixun_producer
-      staffs.joins(staff: :user).where(category:BusinessSubjectStaff::CATEGORY_TYPES::SHIXUN_PRODUCER).pluck("CONCAT(users.lastname, users.firstname) ").join("，")
+      staffs.joins(staff: :user).where(category: BusinessSubjectStaff::CATEGORY_TYPES::SHIXUN_PRODUCER).pluck("CONCAT(users.lastname, users.firstname) ").join("，")
     end
+
     def shixun_staff
-      return business_subject.manges unless  business_subject.nil?
-      staffs.joins(staff: :user).where(category:BusinessSubjectStaff::CATEGORY_TYPES::SHIXUN_STAFF).pluck("CONCAT(users.lastname, users.firstname) ").join("，")
+      staffs.joins(staff: :user).where(category: BusinessSubjectStaff::CATEGORY_TYPES::SHIXUN_STAFF).pluck("CONCAT(users.lastname, users.firstname) ").join("，")
+    end
+    def all_staff
+      staffs.joins(staff: :user).distinct.select("users.id")
+    end
+    def shixun_school
+      name = ""
+      shixuns = BusinessSubjectShixun.find(id)
+      if shixuns.school.present?
+        name = shixuns.school.name
+      end
+      if shixuns.business_subject.present?
+        if shixuns.business_subject.business.present?
+          name = shixuns.business_subject.business.school.name
+        end
+      end
+      p name
     end
-
 
     # 查询审核历史和审核人
     def audit_history
       ShixunDectect.joins("join educode_sales_staffs  on educode_sales_staffs.id = educode_sales_shixun_dectects.reviewed_id
                             join users  on users.id = educode_sales_staffs.user_id")
-                   .where(business_subject_shixun_id:id)
+                   .where(business_subject_shixun_id: id)
                    .where("dectect_type != 0")
                    .select("educode_sales_shixun_dectects.*,
                            CONCAT(users.lastname, users.firstname) as examine_name")
+                   .order("created_at desc")
                    .all
     end
+
     # def school_name
     #   business_subject ? business_subject.school_name : school.name
     # end

data/app/models/educode_sales/business_subject_staff.rb

@@ -29,6 +29,7 @@ module EducodeSales
 
     scope :subject_staffs, ->{where(category: CATEGORY_TYPES::SUBJECT_STAFF)}
     scope :subject_manges, ->{where(category: CATEGORY_TYPES::SUBJECT_MANAGE)}
+    scope :shixun_producer, ->{where(category: CATEGORY_TYPES::SHIXUN_PRODUCER)}
 
   end