educode_sales 0.7.8 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2972ed1989662bb4f717d0a4d84bd29f5605fa53006e744de50836bde4273d51
-  data.tar.gz: 9c64c442924ed94d857c29c9141d22ea66714f237671d46964033e46a075fcef
+  metadata.gz: 6c7d5af9d8ef299b488469e4641429c5f7ef51411ee9749817d215920ab2eefe
+  data.tar.gz: 8ecea150b2f7ebf1c83b46873d79aad3561a803d45c3d96b28be8d96d6ac6d7e
 SHA512:
-  metadata.gz: 25648696a64348151f0380b1c8c160b12ed21263f06417a48aaff9529252048764edd343a78ef88e899c336bbd19cb007168d41dbbbaa7f90d2b75cff656a2aa
-  data.tar.gz: 7e519c3723917de704f95e17d809503aab65401b56a979c48c0a45d3a88f1837b8080305af33994a410c2e10cbff1ccc2d9cdba1ac8652cfe8221ddb1ff21b18
+  metadata.gz: 670ed7ce415e605c9d93dd0eaf7f369beed38af7f5f576726181fb2232281e6eafcbbf9678fb97fb7b4263abfe9c857f19d80e81b55e23186d2e5fc0a08fe11a
+  data.tar.gz: cad4aa2546734ae5cc3807c0947c0d194449867d0086efffeb36248040dba564bd145f06cc96bbe87a2c094b9b62abb364a99d98a6149d0eb54ccf31019ec367

data/app/controllers/educode_sales/application_controller.rb

@@ -27,6 +27,20 @@ module EducodeSales
       end
     end
 
+    def filter
+      params[:check] = params[:check] == "true" ? 0:1
+      begin
+        filter = Filter.find_or_create_by!(staff_id: @current_admin.id, clazz: params[:type])
+        filter.extras["#{params[:name]}"] = params[:check]
+        filter.save!
+        render json: {success: true ,hidden: params[:check]}
+      rescue => e
+        render_failure("操作失败")
+      end
+    end
+
+
+
     rescue_from CanCan::AccessDenied do |exception|
       redirect_to no_permission_path
     end

data/app/controllers/educode_sales/assessments_controller.rb

@@ -2,6 +2,9 @@ require_dependency "educode_sales/application_controller"
 
 module EducodeSales
   class AssessmentsController < ApplicationController
+    before_action :progress_or_get_export_data, only: [:progress, :get_export_data]
+
+
     def index
         respond_to do |format|
           format.html do
@@ -12,45 +15,47 @@ module EducodeSales
             gon.export_menus << { title: '导出到Csv文件', event: 'export_csv' }
             gon.export_menus << { title: '导出到Excel文件', event: 'export_excel' }
             # index页面new弹出层下使用
-            gon.demo = Staff.joins(:user).where(job_type: common.id).map do |d|
+            gon.staff_ids = Staff.joins(:user).where(job_type: common.id).map do |d|
               {value: d.id, name: d.user.real_name }
             end
+            filter = Filter.find_or_create_by(staff_id: @current_admin.id, clazz: "assessments_setup")
+            if filter.extras.present?
+              gon.filter = filter.extras
+            else
+              gon.filter = {}
+            end
           end
           format.json do
-            @assessments = AssessmentsSetting.all
             @year = params[:q].present? && params[:q][:assessment_year].present? ? params[:q][:assessment_year]:'2022'
             @assessments_id = params[:q].present? && params[:q][:assessment_id].present? ? params[:q][:assessment_id]: '1'
-            @assessments = @assessments.where("assessment_year >= ? and assessment_year <= ?", "#{@year}-01-01 00:00:00".to_date, "#{@year}-12-31 23:59:00".to_date)
+            @assessments = AssessmentsSetting.where("assessment_year >= ? and assessment_year <= ?", "#{@year}-01-01 00:00:00".to_date, "#{@year}-12-31 23:59:00".to_date)
             @assessments = @assessments.where(assessment: @assessments_id).order("updated_at desc")
             if params[:q].present? && params[:q][:staff_id].present?
               @assessments = @assessments.where(staff_id: params[:q][:staff_id]).order("updated_at desc")
             end
-            # 对数据进行分页  默认为page=1 limit=10
-            # @assessments = @assessments.order("id desc").page(params[:page]).per(params[:limit])
           end
         end
     end
 
-
-
     # 新增
     def create
       begin
-      demo = AssessmentsSetting.new(params_create)
-      demo.user_id = current_user.user_id
-      demo.assessment_year = "#{params[:assessment_year]}-01-01"
+        assessment = AssessmentsSetting.new(params_create)
+        assessment.user_id = current_user.user_id
+        assessment.assessment_year = "#{params[:assessment_year]}-01-01"
+        AssessmentsSetting.transaction do
         params[:staffs_ids].split(",").each do |d|
-            staff = demo.dup
+            staff = assessment.dup
             staff.staff_id = d.to_i
             staff.save
         end
+      end
         render_success
       rescue  => e
         render_failure '增加数据错误'
       end
     end
 
-
     def new
       render layout: false
     end
@@ -73,166 +78,106 @@ module EducodeSales
       render layout: false
     end
 
-    # 根新数据
+    # 根新
     def update
       @assessment = AssessmentsSetting.find_by(id: params[:id])
       @assessment.update_attributes(params_update)
       render_success
     end
 
-
-
-
-
     # 删除接口
     def destroy
       begin
         assessment = AssessmentsSetting.find(params[:id])
         assessment.destroy
         render_success
-      rescue ActiveRecord::DeleteRestrictionError => e
-        render_failure '渠道下已有关联数据产生，暂不能删除'
+      rescue  => e
+        render_failure '暂不能删除'
       end
     end
 
 
 
 
-
     # 导出数据
     def get_export_data
-      common = Common.find_by(clazz: 'staff_type', name: '销售')
-      @staff_ids = Staff.joins(:user).where(job_type: common.id).pluck(:id)
-      @assessment_id = params[:assessment_id].present? ? params[:assessment_id]:'1'
-      @assessment_year =  params[:assessment_year] ?  params[:assessment_year] : '2022'
-      @assessments =AssessmentsSetting.where(assessment: @assessment_id).
-        where("assessment_year >= ? and assessment_year <= ?", "#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:00".to_date)
-      if params[:staff_id].present?
-        @assessments = @assessments.where(staff_id: params[:staff_id])
-        progress_main
-      else
-        # @assessments = @assessments.where(staff_id: @staff_ids)   注意  这样写有问题
-        @staff_ids.each do |s|
-          @assessments = @assessments.where(staff_id: s).order("updated_at desc")
-          progress_main
-        end
-        @assessments = AssessmentsSetting.where(assessment: @assessment_id).
-          where("assessment_year >= ? and assessment_year <= ?", "#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:00".to_date)
-      end
+      p 'get_export_data'
     end
 
 
 
+    # 考核完成情况
+    def progress
+      p 'progress'
+    end
 
 
 
-
-
-    # 考核完成情况
-    def progress
-      common = Common.find_by(clazz: 'staff_type', name: '销售')
-      @staff_ids = Staff.joins(:user).where(job_type: common.id).pluck(:id)
+    def progress_or_get_export_data
+      # common = Common.find_by(clazz: 'staff_type', name: '销售')
+      # @staff_ids = Staff.joins(:user).where(job_type: common.id).pluck(:id)
       @assessment_id = params[:q].present? && params[:q][:assessment_id].present? ? params[:q][:assessment_id]:'1'
-      @assessment_year = params[:q].present? && params[:q][:assessment_year] ?  params[:q][:assessment_year] : '2022'
-      @assessments =AssessmentsSetting.where(assessment: @assessment_id).
-        where("assessment_year >= ? and assessment_year <= ?", "#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:00".to_date)
-      if params[:q].present? && params[:q][:staff_id].present?
-        @assessments = @assessments.where(staff_id: params[:q][:staff_id])
+      @assessment_year = params[:q].present? && params[:q][:assessment_year].present? ?  params[:q][:assessment_year] : Time.now.year
+      @assessments =AssessmentsSetting.where(assessment: @assessment_id)
+                                      .where("assessment_year >= ? and assessment_year <= ?", "#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:00".to_date)
+                                      .order("created_at desc")
+      if @assessments.present?
+        # 小优化
+        @staff_ids = params[:q].present? && params[:q][:staff_id].present? ? [params[:q][:staff_id].to_i]:@assessments.distinct.pluck(:staff_id)
         progress_main
-      else
-        # @assessments = @assessments.where(staff_id: @staff_ids)   注意  这样写有问题
-        @staff_ids.each do |s|
-          @staff_id = s
-          @assessments = @assessments.where(staff_id: s)
-          progress_main
-        end
-        @assessments = AssessmentsSetting.where(assessment: @assessment_id)
-                                         .where("assessment_year >= ? and assessment_year <= ?","#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:59".to_date )
-                                         .order("updated_at desc")
+        #  注意一下
+        @assessments = @assessments.where(staff_id: @staff_ids)
       end
     end
 
 
-
-
     # todo 主方法  统计用户的数据
     def progress_main
-      if @assessments.present?
-        a = []
         case @assessment_id
         when '1' # 签单金额
           busniness_jurisdiction
-          signed_amount(a)
+          signed_count
         when '2' # 回款金额
-          collection_amount(a)
+          collection_count
         when '3' # 拜访量
           visits
-          school_ids = EducodeSales::CustomerExtension.where(customer_staff_id: @staff_id).pluck(:school_id)
-          @customers = @customers.where(id: school_ids)
-          busniness_visits(a)  # 商机拜访量
-          customer_visits(a)  # 客户拜访量
+          customer_and_busniness_visits
         when '4' # 新增商机数
           busniness_jurisdiction
-          busniness_add(a)
+          busniness_add
         end
-        update_assessments_progress(a)
-      else
-      end
     end
 
 
 
-
     # 签单金额
-    def signed_amount(a)
+    def signed_count
       # 过滤x类商机
-      ids = Common.where(extras: %w[a_class b_class c_class d_claass e_class o_class]).pluck(:id)
-      @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.clazz_id in (?) ",ids)
+      ids = Common.where.not(extras: %w[x_class]).pluck(:id)
+      @businesses = @businesses.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id in (?) ",ids)
+                               .where("educode_sales_follow_ups.signed_date >= ? and educode_sales_follow_ups.signed_date <= ?",
+                                      "#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:59".to_date)
       # 得到最新阶段为已签单商机
       s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
       @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.stage_id IN (?)",s_stage_ids)
-      # 得到指定staff的商机------------先暂时指定
-      @businesses = @businesses.where(staff_id: @staff_id)
-      # 对businesses each操作并 获取最新根新记录
-      @businesses.each { |d| d
-      @follow_ups = d.follow_ups.where.not(signed_date: nil).order("signed_date desc")
-      if @follow_ups.first.present?
-        signed_date = @follow_ups.first.signed_date.to_time || '1000-01-01 00:00:00'.to_time
-        case signed_date.to_s[0..6]
-        when "#{@assessment_year}-01"
-          a[0] = a[0].to_i + @follow_ups.first.actual_amount.to_i
-        when "#{@assessment_year}-02"
-          a[1] = a[1].to_i + @follow_ups.first.actual_amount.to_i
-        when "#{@assessment_year}-03"
-          a[2] = a[2].to_i + @follow_ups.first.actual_amount.to_i
-        when "#{@assessment_year}-04"
-          a[3] = a[3].to_i + @follow_ups.first.actual_amount.to_i
-        when "#{@assessment_year}-05"
-          a[4] = a[4].to_i + @follow_ups.first.actual_amount.to_i
-        when "#{@assessment_year}-06"
-          a[5] = a[5].to_i + @follow_ups.first.actual_amount.to_i
-        when "#{@assessment_year}-07"
-          a[6] = a[6].to_i + @follow_ups.first.actual_amount.to_i
-        when "#{@assessment_year}-08"
-          a[7] = a[7].to_i + @follow_ups.first.actual_amount.to_i
-        when "#{@assessment_year}-09"
-          a[8] = a[8].to_i + @follow_ups.first.actual_amount.to_i
-        when "#{@assessment_year}-10"
-          a[9] = a[9].to_i + @follow_ups.first.actual_amount.to_i
-        when "#{@assessment_year}-11"
-          a[10] = a[10].to_i + @follow_ups.first.actual_amount.to_i
-        when "#{@assessment_year}-12"
-          a[11] = a[11].to_i + @follow_ups.first.actual_amount.to_i
+      @staff_ids.each do |d|
+        # 注意
+        businesses = @businesses.where(staff_id: d)
+        data_count=[]
+        data_list = FollowUp.joins("JOIN educode_sales_businesses ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id")
+                .where("educode_sales_businesses.id in (?)",businesses.pluck(:id)).map do |m|
+          {value: m.actual_amount.to_i, date:m.signed_date.to_s[5..6].to_i}
         end
+        count_data(data_list,data_count)  #  统计数据
+        update_assessments_progress(data_count,d) #  批量更新assessment数据  事物  一个commit
       end
-      }
     end
 
 
-    # 回款金额
-    def collection_amount(a)
+    # 回款金额 权限
+    def collection_count
       follow_up_ids = Business.pluck(:last_follow_up_id)
       if @current_admin.is_admin?
         @money_plans = MoneyPlan.joins(:follow_up).where(follow_up_id: follow_up_ids)
@@ -247,43 +192,25 @@ module EducodeSales
           b_ids = Business.where(school_id: school_ids).pluck(:last_follow_up_id)
           ids = a_ids + b_ids
           @money_plans = MoneyPlan.joins(:follow_up).where(follow_up_id: ids)
-        else
+          else
           @money_plans = MoneyPlan.joins(:follow_up).where(follow_up_id: follow_up_ids)
         end
       end
-      #  todo 1 :实际回款 0:计划回款 where(clazz: 1 OR 实际回款 )  先把staff写死
-      @money_plans = @money_plans.where(clazz: 1).where.not(date_at: nil ).where(staff_id: @staff_id)
-      @money_plans.each do |d|
-        case d.date_at.to_s[0..6]
-        when "#{@assessment_year}-01"
-          a[0] = a[0].to_i + d.amount.to_i
-        when "#{@assessment_year}-02"
-          a[1] = a[1].to_i +  d.amount.to_i
-        when "#{@assessment_year}-03"
-          a[2] = a[2].to_i +  d.amount.to_i
-        when "#{@assessment_year}-04"
-          a[3] = a[3].to_i + d.amount.to_i
-        when "#{@assessment_year}-05"
-          a[4] = a[4].to_i + d.amount.to_i
-        when "#{@assessment_year}-06"
-          a[5] = a[5].to_i +  d.amount.to_i
-        when "#{@assessment_year}-07"
-          a[6] = a[6].to_i +  d.amount.to_i
-        when "#{@assessment_year}-08"
-          a[7] = a[7].to_i +  d.amount.to_i
-        when "#{@assessment_year}-09"
-          a[8] = a[8].to_i +  d.amount.to_i
-        when "#{@assessment_year}-10"
-          a[9] = a[9].to_i +  d.amount.to_i
-        when "#{@assessment_year}-11"
-          a[10] = a[10].to_i +  d.amount.to_i
-        when "#{@assessment_year}-12"
-          a[11] = a[11].to_i +  d.amount.to_i
+      #  todo 1 :实际回款 0:计划回款 where(clazz: 1 OR 实际回款 )
+      @money_plans = @money_plans.where(clazz: 1).where.not(date_at: nil)
+      @staff_ids.each do |d|
+        data_count = []
+        data_list = @money_plans.where(staff_id: d).map do |m|
+          {date:m.date_at.to_s[5..6].to_i, value:m.amount.to_i}
         end
+        count_data(data_list,data_count)
+        update_assessments_progress(data_count, d)
       end
     end
 
-    # 拜访量
+
+
+    # 权限获取拜访量
     def visits
       if @current_admin.is_admin?
         @customers = School.all
@@ -308,120 +235,44 @@ module EducodeSales
       @customers = @customers.where(id: ids)
     end
 
-    # 客户拜访量
-    def customer_visits(a)
-      @customers.each do |d|
-        customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
-        customer_follows.each do |f|
-          case f.created_at.to_time.to_s[0..6]
-          when "#{@assessment_year}-01"
-            a[0] = a[0].to_i + 1
-          when "#{@assessment_year}-02"
-            a[1] = a[1].to_i +  1
-          when "#{@assessment_year}-03"
-            a[2] = a[2].to_i +  1
-          when "#{@assessment_year}-04"
-            a[3] = a[3].to_i + 1
-          when "#{@assessment_year}-05"
-            a[4] = a[4].to_i + 1
-          when "#{@assessment_year}-06"
-            a[5] = a[5].to_i +  1
-          when "#{@assessment_year}-07"
-            a[6] = a[6].to_i + 1
-          when "#{@assessment_year}-08"
-            a[7] = a[7].to_i +  1
-          when "#{@assessment_year}-09"
-            a[8] = a[8].to_i +  1
-          when "#{@assessment_year}-10"
-            a[9] = a[9].to_i +  1
-          when "#{@assessment_year}-11"
-            a[10] = a[10].to_i +  1
-          when "#{@assessment_year}-12"
-            a[11] = a[11].to_i +  1
-          end
-        end
-      end
-      end
-
 
-    # 商机拜访量
-    def busniness_visits(a)
-      @customers.each do |d|
-        business_ids = EducodeSales::Business.where(school_id:  d.id).ids
-        follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
-        follow_ups.each do |f|
-          case f.created_at.to_time.to_s[0..6]
-          when "#{@assessment_year}-01"
-            a[0] = a[0].to_i + 1
-          when "#{@assessment_year}-02"
-            a[1] = a[1].to_i +  1
-          when "#{@assessment_year}-03"
-            a[2] = a[2].to_i +  1
-          when "#{@assessment_year}-04"
-            a[3] = a[3].to_i + 1
-          when "#{@assessment_year}-05"
-            a[4] = a[4].to_i + 1
-          when "#{@assessment_year}-06"
-            a[5] = a[5].to_i +  1
-          when "#{@assessment_year}-07"
-            a[6] = a[6].to_i + 1
-          when "#{@assessment_year}-08"
-            a[7] = a[7].to_i +  1
-          when "#{@assessment_year}-09"
-            a[8] = a[8].to_i +  1
-          when "#{@assessment_year}-10"
-            a[9] = a[9].to_i +  1
-          when "#{@assessment_year}-11"
-            a[10] = a[10].to_i +  1
-          when "#{@assessment_year}-12"
-            a[11] = a[11].to_i +  1
-          end
+    # 拜访量
+    def customer_and_busniness_visits
+      @staff_ids.each do |m|
+        customers = @customers.where(id: EducodeSales::CustomerExtension.where(customer_staff_id: m).pluck(:school_id))
+        data_list = []
+        data_count = []
+        CustomerFollow.joins(:school).where(school_id: customers.pluck(:id))
+                              .where("Educode_Sales_customer_follows.created_at >= ? and Educode_Sales_customer_follows.created_at <= ?","#{@assessment_year}-01-01 ","#{@assessment_year}-12-31 23:59:59" )
+                              .each do |d|
+          data_list << {value: 1, date: d.created_at.to_s[5..6].to_i}
         end
+        FollowUp.joins(:business).where("Educode_Sales_businesses.id in (?)",EducodeSales::Business.where(school_id: customers.pluck(:id)).pluck(:id))
+                .where("Educode_Sales_follow_ups.created_at >= ? and Educode_Sales_follow_ups.created_at <= ?","#{@assessment_year}-01-01 00:00:00", "#{@assessment_year}-12-31 23:59:59").each do |d|
+          data_list << {date: d.created_at.to_s[5..6].to_i, value: 1}
+        end
+        count_data(data_list,data_count)
+        assessment = @assessments.where(staff_id: m)
+        update_assessments_progress(data_count, assessment)
       end
-      end
-      # busniness_jurisdiction
-      # ids = Common.where(extras: %w[a_class b_class c_class d_claass e_class o_class x_class]).pluck(:id)
-      # @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.clazz_id in (?) ",ids)
-      # @businesses = @businesses.where("educode_sales_businesses.follow_ups_count > ?",'0').where(staff_id: @staff_id)
+    end
 
 
 
 
     # 新增商机数
-    def busniness_add(a)
-      # 1.新增商机数统计在哪一个时间段？以商机的创建时间为准；先默认 过滤2022之前的 businesses -created_et deleted_at follow_ups_count
-      @businesses = @businesses.where("educode_sales_businesses.created_at >= ? and educode_sales_businesses.created_at <= ?", "#{@assessment_year}-01-01 00:00:00".to_date,"#{@assessment_year}-12-31 23:59:59".to_date)
-      # 2.销售人员新增的商机数量，过滤E、O、X类商机，包含：ABCD类商机；  上面有连接follow_up表
-      ids = Common.where(extras: %w[a_class b_class c_class d_class]).pluck(:id) # 数组[1,5,2,15]
+    def busniness_add
+      @businesses = @businesses.where("educode_sales_businesses.created_at >= ? and educode_sales_businesses.created_at <= ?", "#{@assessment_year}-01-01 00:00:00","#{@assessment_year}-12-31 23:59:59")
+      ids = Common.where(extras: %w[a_class b_class c_class d_class]).pluck(:id)
       @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.clazz_id in (?) ",ids)
-      @businesses = @businesses.where(staff_id: @staff_id)
-      @businesses.each do |d|
-        case d.created_at.to_time.to_s[0..6]
-        when "#{@assessment_year}-01"
-          a[0] = a[0].to_i + 1
-        when "#{@assessment_year}-02"
-          a[1] = a[1].to_i +  1
-        when "#{@assessment_year}-03"
-          a[2] = a[2].to_i +  1
-        when "#{@assessment_year}-04"
-          a[3] = a[3].to_i + 1
-        when "#{@assessment_year}-05"
-          a[4] = a[4].to_i + 1
-        when "#{@assessment_year}-06"
-          a[5] = a[5].to_i +  1
-        when "#{@assessment_year}-07"
-          a[6] = a[6].to_i + 1
-        when "#{@assessment_year}-08"
-          a[7] = a[7].to_i +  1
-        when "#{@assessment_year}-09"
-          a[8] = a[8].to_i +  1
-        when "#{@assessment_year}-10"
-          a[9] = a[9].to_i +  1
-        when "#{@assessment_year}-11"
-          a[10] = a[10].to_i +  1
-        when "#{@assessment_year}-12"
-          a[11] = a[11].to_i +  1
+      @staff_ids.each do |d|
+        businesses = @businesses.where(staff_id: d)
+        data_count = []
+        data_list = businesses.map do |m|
+          {date: m.created_at.to_s[5..6].to_i, value: 1}
         end
+        count_data(data_list,data_count)  #  统计数据
+        update_assessments_progress(data_count, d)  #  批量更新assessment数据  事物  一个commit
       end
     end
 
@@ -430,7 +281,7 @@ module EducodeSales
     def busniness_jurisdiction
       # busniness  权限
       if @current_admin.is_admin?
-        @businesses = Business
+        @businesses = Business.all
       else
         level = @current_admin.role.role_areas.find_by(clazz: '商机管理').level
         case level
@@ -443,29 +294,45 @@ module EducodeSales
           business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
           @businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}  OR educode_sales_businesses.id in (?)", school_ids, business_ids)
         else
-          @businesses = Business
+          @businesses = Business.all
         end
       end
     end
 
+
     # 更新assessments_settings表中数据
-    def update_assessments_progress(a)
-        a[12] = a[0].to_i + a[1].to_i + a[2].to_i
-        a[13] = a[3].to_i + a[4].to_i + a[5].to_i
-        a[14] = a[6].to_i + a[7].to_i + a[8].to_i
-        a[15] = a[9].to_i + a[10].to_i + a[11].to_i
-        a[16] = a[12].to_i + a[13].to_i + a[14].to_i + a[15].to_i
-        @assessments.each do |d|
-        d.update(annual_progress: a[16], first_quarter_progress: a[12], second_quarter_progress: a[13], third_quarter_progress: a[14], fourth_quarter_progress: a[15],
-                           january_progress: a[0], february_progress: a[1], march_progress: a[2], april_progress: a[3], may_progress: a[4], june_progress: a[5],
-                           july_progress: a[6], august_progress: a[7], september_progress: a[8], october_progress: a[9], november_progress: a[10], december_progress: a[11])
+    def update_assessments_progress(data_count,staff_id)
+      data_count[12] = data_count[0].to_i + data_count[1].to_i + data_count[2].to_i
+      data_count[13] = data_count[3].to_i + data_count[4].to_i + data_count[5].to_i
+      data_count[14] = data_count[6].to_i + data_count[7].to_i + data_count[8].to_i
+      data_count[15] = data_count[9].to_i + data_count[10].to_i + data_count[11].to_i
+      data_count[16] = data_count[12].to_i + data_count[13].to_i + data_count[14].to_i + data_count[15].to_i
+        # 开启事物  处理 批量修改数据
+        assessments = @assessments.where(staff_id: staff_id)
+        assessments.update(annual_progress: data_count[16], first_quarter_progress: data_count[12], second_quarter_progress: data_count[13], third_quarter_progress: data_count[14], fourth_quarter_progress: data_count[15],
+                              january_progress: data_count[0], february_progress: data_count[1], march_progress: data_count[2], april_progress: data_count[3], may_progress: data_count[4], june_progress: data_count[5],
+                              july_progress: data_count[6], august_progress: data_count[7], september_progress: data_count[8], october_progress: data_count[9], november_progress: data_count[10], december_progress: data_count[11])
+
+    end
+
+    # 将统计到的数据转入a中
+    def count_data(data_list,data_count)
+      data_list.each do |d|
+        if data_count[d[:date]-1].present?
+          data_count[d[:date]-1] = data_count[d[:date]-1] + d[:value]
+        else
+          data_count[d[:date]-1] = d[:value]
         end
-        @assessments.order("created_at desc")
+      end
     end
 
 
 
 
+
+
+
+
     private
       def params_create
         params.permit( :annual, :assessment,:assessment_year, :first_quarter, :second_quarter, :third_quarter, :fourth_quarter,