educode_sales 0.9.66 → 0.9.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c77ba5bbfa29534697eba58c7d999ffbe0834fb358aae6b3e923278e5f16475e
-  data.tar.gz: 78b061d50d1bd7bff1e58e2dfdc4bcf23ac85661980324dfce85b0dd961d8dac
+  metadata.gz: 68edf1ae34edbb71f7c415a1bf1f298683c507681463630bbe54cd9e008a1d18
+  data.tar.gz: f7dc04cdeab6ff2fe4e696265e5175abd99095dda76fd8dbba2263afa103190e
 SHA512:
-  metadata.gz: 4567e920c14a07085963ca478f9629def13a74ab78e5d0f1c8a9559e5c32f9e1e2ebed39bef4396a1f3d1e5e6e8b42ea5dd18128c8be6275b5c91430d59b32f2
-  data.tar.gz: dc98da54f8926781094902266a9eeaae2e0d1f6cab8837c27795bccab0d031da4946f19246baefdd11534af288a9afc37aa3e4ecf865a22d7d0a6a499870b809
+  metadata.gz: 2fed0873dcabcf99b57d6713f2df0e59efc030ffbc27b23e7cacd02e05e81d42db0e3e571663a3230ee43a3885bcc5f3833f0cf3ed601f1a7136f62ace3a3833
+  data.tar.gz: 653629bfc15b4d1ad604462f17b61ddf9512e26d9cc0f806177b8048d2f665ec1ff28d2c33191ed9ef1c7167db9ee895c70239493d45bf03dddae4cfbf426eaf

data/app/controllers/educode_sales/activities_controller.rb

@@ -5,17 +5,25 @@ module EducodeSales
     def index
       respond_to do |format|
         format.html do
-         @staffs = Staff.all.map { |d| [ d.user&.real_name, d.id ]}
+        common = Common.find_by(clazz: 'staff_type', name: '销售')
+        @staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11).map { |d| [d.user.real_name, d.id]}
+
+        role = EducodeSales::Role.find_by(name: '生态经理')
+        @staff_manage = Staff.joins(:user).where(role_id: role.id).map { |d| [d.user.real_name, d.id]}
         end
         format.json do
           @activities = Activity
           if params[:q].present?
             if params[:q][:staff_id].present?
-              @activities = @activities.where(staff_id: params[:q][:staff_id])
+              @activities = @activities.where(sales_id: params[:q][:staff_id])
             end
             if params[:q][:clazz_id].present?
               @activities = @activities.where(clazz_id: params[:q][:clazz_id])
             end
+
+            if params[:q][:state_id].present?
+              @activities = @activities.where(state_id: params[:q][:state_id])
+            end
             
             if params[:q][:name].present?
               @activities = @activities.where("educode_sales_activities.name like ?", "%#{params[:q][:name]}%")
@@ -48,37 +56,43 @@ module EducodeSales
 
     def edit
       @activity = Activity.find(params[:id])
+      @clazz = ['全国会议', '区域会议', '单校会议', '国赛', '省赛', '夏令营']
       manage_ids = @activity.manages.pluck(:staff_id)
       assist_ids = @activity.assists.pluck(:staff_id)
       gon.staff_manage = Staff.all.map { |d| {name: d.user&.real_name, value: d.id, selected: manage_ids.include?(d.id)}}
-      gon.assists = Staff.all.map { |d| {name: d.user&.real_name, value: d.id, selected: assist_ids.include?(d.id)}}
-      gon.experts = @activity.experts.map { |d| {name: d.name, value: d.user_id || d.name, selected: true}}
+      gon.assistss = @activity.assists.map { |d| {name: d.name, value: d.user_id || d.name, selected: true}}
+
+      gon.invitation_list = @activity.invitations.map { |d| {name: d.name, value: d.user_id || d.name, selected: true}}
+
+      sale_id = @activity.sales_id || @activity.staff_id
+
+      gon.sales_manage = Staff.all.map { |d| {name: d.user&.real_name, value: d.id, selected: d.id == sale_id }}
       render layout: false
     end
 
     def create
       activity = @current_admin.activities.new(activity_params)
-
-      # render_success
+      activity.sales_id = @current_admin.id
       if activity.save
         params[:staff_manage_id].each do |d|
           EducodeSales::ActivityStaff.create(staff_id: d, clazz_id: 'manage', activity_id: activity.id)
         end
+    
         params[:staff_assist_id].each do |d|
-          EducodeSales::ActivityStaff.create(staff_id: d, clazz_id: 'assist', activity_id: activity.id)
-        end
-        params[:expert_ids].each do |d|
           if d[0].to_i > 0
             u = User.find(d[0].to_i)
-            EducodeSales::ActivityStaff.create(name: u.real_name, clazz_id: 'expert', user_id: d[0].to_i, activity_id: activity.id)
+            EducodeSales::ActivityStaff.create(name: u.real_name, clazz_id: 'assist', user_id: d[0].to_i, activity_id: activity.id)
           else
-            EducodeSales::ActivityStaff.create(name: d[1], clazz_id: 'expert', activity_id: activity.id)
+            EducodeSales::ActivityStaff.create(name: d[1], clazz_id: 'assist', activity_id: activity.id)
           end
         end
-        if params[:attachment_id].present?
-          attachment = @current_admin.user.attachments.find(params[:attachment_id])
-          attachment.container = activity
-          attachment.save
+        params[:invitation_ids].each do |d|
+          if d[0].to_i > 0
+            u = User.find(d[0].to_i)
+            EducodeSales::ActivityStaff.create(name: u.real_name, clazz_id: 'invitation', user_id: d[0].to_i, activity_id: activity.id)
+          else
+            EducodeSales::ActivityStaff.create(name: d[1], clazz_id: 'invitation', activity_id: activity.id)
+          end
         end
         render_success
       else
@@ -88,45 +102,45 @@ module EducodeSales
 
     def update
       activity = Activity.find(params[:id])
-      activity.assign_attributes(name: params[:name], start_at: params[:start_at], days: params[:days])
+      activity.assign_attributes(
+        state_id: params[:state_id],
+        name: params[:name], 
+        start_at: params[:start_at], days: params[:days],
+        sponsor: params[:sponsor],
+        linkman: params[:linkman],
+        phone: params[:phone],
+        scale: params[:scale],
+        address: params[:address],
+        meeting_form: params[:meeting_form],
+        sales_id: params[:sales_id] || @current_admin.id
+       )
       manages = []
-      experts = []
       assists = []
+      invitations = []
       params[:staff_manage_id].each do |d|
         manages << EducodeSales::ActivityStaff.find_or_initialize_by(staff_id: d, clazz_id: 'manage', activity_id: activity.id)
       end
    
       params[:staff_assist_id].each do |d|
-        assists << EducodeSales::ActivityStaff.find_or_initialize_by(staff_id: d, clazz_id: 'assist', activity_id: activity.id)
+        if d[0].to_i > 0
+          u = User.find(d[0].to_i)
+          assists << EducodeSales::ActivityStaff.find_or_initialize_by(name: u.real_name, clazz_id: 'assist', user_id: d[0].to_i, activity_id: activity.id)
+        else
+          assists << EducodeSales::ActivityStaff.find_or_initialize_by(name: d[1], clazz_id: 'assist', activity_id: activity.id)
+        end
       end
-      params[:expert_ids].each do |d|
+      params[:invitation_ids].each do |d|
         if d[0].to_i > 0
           u = User.find(d[0].to_i)
-          experts << EducodeSales::ActivityStaff.find_or_initialize_by(name: u.real_name, clazz_id: 'expert', user_id: d[0].to_i, activity_id: activity.id)
+          invitations << EducodeSales::ActivityStaff.find_or_initialize_by(name: u.real_name, clazz_id: 'invitation', user_id: d[0].to_i, activity_id: activity.id)
         else
-          experts << EducodeSales::ActivityStaff.find_or_initialize_by(name: d[1], clazz_id: 'expert', activity_id: activity.id)
+          invitations << EducodeSales::ActivityStaff.find_or_initialize_by(name: d[1], clazz_id: 'invitation', activity_id: activity.id)
         end
       end
       activity.manages = manages
       activity.assists = assists
-      activity.experts = experts
-
-      if params[:attachment_id].present?
-        if activity.attachment&.id && activity.attachment&.id != params[:attachment_id].to_i
-          file_path = File.join(Rails.root, "public", "files", 'educode_sales', activity.attachment.disk_filename)
-          File.delete(file_path) if File.exist?(file_path)
-          activity.attachment.destroy
-        end
-        attachment = @current_admin.user.attachments.find(params[:attachment_id])
-        attachment.container = activity
-        attachment.save
-      else
-        if activity.attachment
-          file_path = File.join(Rails.root, "public", "files", 'educode_sales', activity.attachment.disk_filename)
-          File.delete(file_path) if File.exist?(file_path)
-          activity.attachment.destroy
-        end
-      end
+      activity.invitations = invitations
+      
       if activity.save
         render_success
       else
@@ -151,6 +165,10 @@ module EducodeSales
       render layout: false
     end
 
+    def upload_file
+      render layout: false
+    end
+
     def show_schools
       respond_to do |format|
         format.html do
@@ -163,10 +181,74 @@ module EducodeSales
       end
     end
 
+    def new_follow_up
+      @activity = Activity.find(params[:id])
+      render layout: false
+    end
+
+    def follow_up
+      activity = Activity.find(params[:id])
+      follow_up =  EducodeSales::ActivityFollowUp.new(activity_id: activity.id, staff_id: @current_admin.id, description: params[:description], info_id: params[:info_id])
+      if follow_up.save
+        activity.last_follow_up_id = follow_up.id
+        activity.save
+        render_success
+      else
+        render_failure follow_up
+      end
+      
+    end
+
+    def follow_ups
+      @data = ActivityFollowUp.includes(:staff, activity: :staff)
+
+      if params[:sort].present? && params[:sort][:field]
+        @data = @data.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+      else
+        @data = @data.order("created_at desc")
+      end
+      @data = @data.distinct.page(params[:page]).per(params[:limit])
+    end
+
+    def update_advise
+      activity = Activity.find(params[:id])
+      if activity.last_follow_up
+        activity.last_follow_up.update(advise: params[:content])
+        render_success
+      else
+        render_failure '无跟进动态，暂不能添加建议'
+      end
+    end
+
+    def add_advise
+      followup = ActivityFollowUp.find(params[:id])
+      followup.update(advise: params[:content])
+      render_success
+    end
+
+
+    def files
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+          activity = Activity.find(params[:id])
+          @files = activity.attachments
+          if params[:sort].present? && params[:sort][:field]
+            @files = @files.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @files = @files.order("created_on desc")
+          end
+          @files = @files.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
     private
 
     def activity_params
-      params.permit(:name, :start_at, :days, :staff_assist_id, :staff_manage_id, :clazz_id, :expert)
+      params.permit(:name, :start_at, :days, :staff_assist_id, :staff_manage_id, :clazz_id, :expert, :state_id, :sponsor, :linkman, :phone, :scale, :address, :meeting_form)
     end
 
   end

data/app/controllers/educode_sales/businesses_controller.rb

@@ -297,6 +297,24 @@ module EducodeSales
 
           @business_count = @businesses.distinct.count
           # mysql -select
+          watch_sql = " "
+          unless @current_admin.is_admin?
+            # 保密和战略商机，只有自己，指定人员或管理员才有权限查看
+            watch_sql = " LEFT JOIN educode_sales_business_watches ON educode_sales_business_watches.business_id = educode_sales_businesses.id
+            LEFT JOIN educode_sales_business_levels ON educode_sales_business_levels.business_id = educode_sales_businesses.id"
+            @businesses = @businesses.where("educode_sales_business_levels.id IS NULL OR (educode_sales_business_levels.id IS NOT NULL AND educode_sales_businesses.staff_id = #{@current_admin.id}) OR educode_sales_business_levels.level_id NOT IN (1,2) OR (educode_sales_business_levels.level_id IN (1, 2) AND educode_sales_business_watches.staff_id = #{@current_admin.id})")
+          end
+          if params[:q][:level_id].present?
+           
+            if @current_admin.is_admin?
+              watch_sql = " JOIN educode_sales_business_levels ON educode_sales_business_levels.business_id = educode_sales_businesses.id"
+              @businesses = @businesses.where("educode_sales_business_levels.level_id = ?", params[:q][:level_id])
+            else
+              watch_sql = " JOIN educode_sales_business_watches ON educode_sales_business_watches.business_id = educode_sales_businesses.id
+              JOIN educode_sales_business_levels ON educode_sales_business_levels.business_id = educode_sales_businesses.id AND educode_sales_business_levels.level_id = #{params[:q][:level_id].to_i}"
+              @businesses = @businesses.where("(educode_sales_businesses.staff_id = #{@current_admin.id}) OR educode_sales_business_levels.level_id NOT IN (1,2) OR (educode_sales_business_levels.level_id IN (1, 2) AND educode_sales_business_watches.staff_id = #{@current_admin.id})" )
+            end
+          end
           @businesses = @businesses.select("
             distinct
             educode_sales_businesses.*,
@@ -326,6 +344,7 @@ module EducodeSales
               WHERE educode_sales_follow_ups.deleted_at IS NULL
               GROUP BY educode_sales_follow_ups.business_id
             ) AS total_follow_ups ON educode_sales_businesses.id = total_follow_ups.business_id
+            #{watch_sql}
           ").includes(:users, last_follow_up: [:clazz, :assign_follow_ups]).page(params[:page]).per(params[:limit])
 
         end
@@ -369,7 +388,14 @@ module EducodeSales
 
     def edit
       @business = Business.find(params[:id])
-      gon.department = {value: @business.department_id, name: "#{@business.department.school.name}-#{@business.department.name}"}
+      levels = @business.business_levels.pluck(:level_id)
+      staff_ids = @business.business_watches.pluck(:staff_id)
+
+      gon.is_secret = levels.include?("保密型") || levels.include?("战略型")
+
+      gon.levels = EducodeSales::BusinessLevel.level_ids.keys.map { |d| {name: d, value: d, selected: levels.include?(d)}}
+      gon.watche_ids = Staff.all.map { |d| {name: d.user&.real_name, value: d.id, selected: staff_ids.include?(d.id)}}
+      gon.department = {value: @business.department_id, name: "#{@business.department&.school&.name}-#{@business.department&.name}"}
       gon.value = @business.department_id
       render layout: false
     end
@@ -377,6 +403,26 @@ module EducodeSales
     def update
       business = Business.find(params[:id])
       department = Department.find(params[:department_id])
+      if @current_admin.is_admin?
+        if params[:level_ids]
+          levels = []
+          params[:level_ids].split(",").each do |d|
+            levels << business.business_levels.find_or_initialize_by(level_id: d)
+          end
+          business.business_levels = levels
+
+          if params[:watch_ids].blank? || !params[:level_ids].split(",").include?('保密型') && !params[:level_ids].split(",").include?('战略型')
+            business.business_watches.destroy_all
+          else
+            staffs = []
+            params[:watch_ids].split(",").each do |d|
+              staffs << business.business_watches.find_or_initialize_by(staff_id: d)
+            end
+            business.business_watches = staffs
+          end
+        end
+      end
+
       if business.update(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id)
         if params[:merge_business_ids].present?
           merge_business =  Business.where(id: params[:merge_business_ids].split(","))
@@ -457,6 +503,16 @@ module EducodeSales
       load_business
       respond_to do |format|
         format.html do
+          unless @current_admin.is_admin?
+            levels = @business.business_levels.pluck(:level_id)
+            staff_ids = @business.business_watches.pluck(:staff_id)
+
+            if levels.include?("保密型") || levels.include?("战略型")
+              if !staff_ids.include?(@current_admin.id) && @business.staff_id != @current_admin.id && @business.last_follow_up&.staff_id != @current_admin.id
+                return render "no_permission", layout: false
+              end
+            end
+          end
           render layout: false
         end
         format.json do
@@ -499,8 +555,22 @@ module EducodeSales
     def show_follow_record
       follow_up_id = params[:follow_up_id]
       @follow_up = FollowUp.find(follow_up_id)
+
+      @business = Business.find(@follow_up.business_id)
+      # 保密商机限制查看
+      unless @current_admin.is_admin?
+        levels = @business.business_levels.pluck(:level_id)
+        staff_ids = @business.business_watches.pluck(:staff_id)
+
+        if levels.include?("保密型") || levels.include?("战略型")
+          if !staff_ids.include?(@current_admin.id) && @business.staff_id != @current_admin.id && @business.last_follow_up&.staff_id != @current_admin.id
+            return render "no_permission", layout: false
+          end
+        end
+      end
+
       id = @follow_up.id
-      @follow_ups = Business.find(@follow_up.business_id).follow_ups
+      @follow_ups = @business.follow_ups
       ids = @follow_ups.ids
       size = ids.size
       ids = ids.reverse
@@ -546,6 +616,17 @@ module EducodeSales
       @business = Business.find(params[:business_id])
       respond_to do |format|
         format.html do
+          # 保密商机限制查看
+          unless @current_admin.is_admin?
+            levels = @business.business_levels.pluck(:level_id)
+            staff_ids = @business.business_watches.pluck(:staff_id)
+
+            if levels.include?("保密型") || levels.include?("战略型")
+              if !staff_ids.include?(@current_admin.id) && @business.staff_id != @current_admin.id && @business.last_follow_up&.staff_id != @current_admin.id
+                return render "no_permission", layout: false
+              end
+            end
+          end
           @follow_ups = @business.follow_ups.order(created_at: :desc)
           @latest = @follow_ups.present? ? @follow_ups[0] : nil
           render layout: false

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -72,11 +72,15 @@ module EducodeSales
     def create
       plan = @current_admin.operation_plans.build(plan_params)
       plan.month = params["month"] + "-1"
-      plan.teacher_id = @current_admin.teachers.find(params[:teacher_id]).id
-      if plan.save
-        render_success
+      if (Integer(params[:teacher_id]) rescue nil)
+        plan.teacher_id = @current_admin.teachers.find(params[:teacher_id]).id
+        if plan.save
+          render_success
+        else
+          render_failure plan
+        end
       else
-        render_failure plan
+        render_failure '不存在该教师'
       end
     end
 

data/app/controllers/educode_sales/plans_controller.rb

@@ -29,9 +29,9 @@ module EducodeSales
             end
           end
           if params[:clazz] == 'week'
-            @sale_plans = @sale_plans.where.not(weekly: nil)
-          else
-            @sale_plans = @sale_plans.where(weekly: nil)
+            @sale_plans = @sale_plans.where.not(weekly: nil).where.not(month: nil)
+          elsif params[:clazz] == 'month'
+            @sale_plans = @sale_plans.where(weekly: nil).where.not(month: nil)
           end
           if params[:q].present? && params[:q][:staff_id].present?
             @sale_plans = @sale_plans.where(staff_id: params[:q][:staff_id])
@@ -59,13 +59,34 @@ module EducodeSales
     end
 
     def create
-      plan = @current_admin.sale_plans.build(plan_params)
-      plan.month = params["month"] + "-1"
-      plan.business = Business.find_by(id: params[:business_id])
-      if plan.save
+      if params["year"].present?
+        business = Business.find_by(id: params[:business_id])
+        plan = @current_admin.sale_plans.build(year: params[:year], business_id: business.id, clazz: params[:clazz])
+        if plan.save
+          render_success
+        else
+          render_failure plan
+        end
+      else
+        plan = @current_admin.sale_plans.build(plan_params)
+        plan.month = params["month"] + "-1"
+        plan.business = Business.find_by(id: params[:business_id])
+        if plan.save
+          render_success
+        else
+          render_failure plan
+        end
+      end
+      
+    end
+
+    def create_business_info
+      business = Business.find_by(id: params[:business_id])
+      info = @current_admin.business_infos.build(year: params[:year], business_id: business.id, clazz: params[:clazz])
+      if info.save
         render_success
       else
-        render_failure plan
+        render_failure info
       end
     end
 
@@ -115,6 +136,14 @@ module EducodeSales
       render layout: false
     end
 
+    def new_year
+      business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
+      @businesses =Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
+      @clazz = EducodeSales::SalePlan::CLAZZ_NAME
+      render layout: false
+    end
+
     def new_monthly
       d = @current_admin
       area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
@@ -196,11 +225,21 @@ module EducodeSales
     end
 
     def destroy
-      sale_plan = SalePlan.find(params[:id])
-      if sale_plan.soft_destroy(@current_admin.id)
+      if params[:year].present?
+        # 删除年度计划
+        sale_plans = SalePlan.where(year: params[:year], clazz: EducodeSales::SalePlan::CLAZZ_NAME[params[:clazz]])
+        sale_plans.each do |d|
+          EducodeSales::Recycle.create(source: d, deleter_id: @current_admin.id)
+        end
+        sale_plans.update_all(deleted_at: Time.now)
         render_success
       else
-        render_failure sale_plan
+        sale_plan = SalePlan.find(params[:id])
+        if sale_plan.soft_destroy(@current_admin.id)
+          render_success
+        else
+          render_failure sale_plan
+        end
       end
     end
 
@@ -242,11 +281,134 @@ module EducodeSales
       @sale_plans =  @sale_plans.page(params[:page]).per(params[:limit])
     end
 
+    def years_plan
+      if @current_admin.is_admin?
+        @sale_plans = SalePlan
+      else
+        level = @current_admin.role.role_areas.find_by(clazz: '销售计划').level
+        case level
+        when '自己'
+          @sale_plans = SalePlan.where(staff_id: @current_admin.id)
+        when '区域'
+          staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
+          business_ids = Business.where(school_id: StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)).pluck(:id)
+          @sale_plans = SalePlan.where("educode_sales_sale_plans.staff_id in (?) OR educode_sales_sale_plans.staff_id = ? OR educode_sales_sale_plans.business_id in (?)", staff_ids, @current_admin.id,business_ids)
+        else
+          @sale_plans = SalePlan
+        end
+      end
+      @sale_plans = @sale_plans.where.not(year: nil)
+      @sale_plans = @sale_plans.select("SUM(last_follow.budget_amount) AS budget_amounts, educode_sales_sale_plans.*, ss.annual")
+      @sale_plans = @sale_plans.joins("
+        JOIN educode_sales_businesses ON educode_sales_businesses.id = educode_sales_sale_plans.business_id
+        LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id AND last_follow.deleted_at IS NULL
+        LEFT JOIN educode_sales_assessments_settings AS ss ON ss.staff_id = educode_sales_sale_plans.staff_id
+            AND YEAR(ss.assessment_year) = educode_sales_sale_plans.year AND ss.assessment = educode_sales_sale_plans.clazz")
+
+      @sale_plans = @sale_plans.group("educode_sales_sale_plans.staff_id, clazz, year")
+
+      @sale_plans = @sale_plans.where(deleted_at: nil)
+
+      if params[:q].present? && params[:q][:year].present?
+        @sale_plans = @sale_plans.where(year: params[:q][:year])
+      end
+      if params[:q].present? && params[:q][:staff_id].present?
+        @sale_plans = @sale_plans.where(staff_id: params[:q][:staff_id])
+      end
+      if params[:sort].present? && params[:sort][:field]
+        @sale_plans = @sale_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+      else
+        @sale_plans = @sale_plans.order("created_at desc")
+      end
+
+      @sale_plans = @sale_plans.page(params[:page]).per(params[:limit])
+    end
+
+    def my_years_plan
+      @sale_plans = SalePlan.where(staff_id: @current_admin.id)
+    end
+
+    def business_infos
+      @data = @current_admin.business_infos.where(sale_plan_id: nil, year: params[:year])
+
+      if params[:sort].present? && params[:sort][:field]
+        @data = @data.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+      else
+        @data = @data.order("created_at desc")
+      end
+      @data = @data.page(params[:page]).per(params[:limit])
+    end
+
+    def edit_bussiness_info
+      @business_info = @current_admin.business_infos.find(params[:id])
+      render layout: false
+    end
+
+    def edit_bussiness_info_extra
+      @business_info = @current_admin.business_infos.find(params[:id])
+      render layout: false
+    end
+
+    def plan_business_infos
+      @data = @current_admin.business_infos.where(year: params[:year])
+
+      if params[:sort].present? && params[:sort][:field]
+        @data = @data.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+      else
+        @data = @data.order("created_at desc")
+      end
+      @data = @data.page(params[:page]).per(params[:limit])
+    end
+
+    def update_business_info
+      business_info = @current_admin.business_infos.find(params[:id])
+      if business_info.update(business_info_params)
+        render_success
+      else
+        render_failure business_info
+      end
+    end
+
+    def update_business_info_extra
+      business_info = @current_admin.business_infos.find(params[:id])
+      if business_info.update(update_business_info_extra_params)
+        render_success
+      else
+        render_failure business_info
+      end
+    end
+
+    def create_sales_plan
+      @current_admin.business_infos.where(sale_plan_id: nil).each do |d|
+        plan = @current_admin.sale_plans.create(year: d.year, business_id: d.business_id, clazz: d.clazz)
+        d.update(sale_plan_id: plan.id)
+      end
+      render_success
+    end
+
+    def delete_business_info
+      @current_admin.business_infos.where(id: params[:id]).destroy_all
+      render_success
+    end
+
+    def edit_year_plan
+      render layout: false
+    end
+
     private
 
     def plan_params
       params.permit(:month, :weekly, :content, :finish_rate, :business_id)
     end
 
+    def business_info_params
+      params.permit(:plan_bid_on, :plan_sign_on, :prepayment_plan_on, :prepayment_amount)
+    end
+
+    def update_business_info_extra_params
+      params.permit(:plan_bid_on, :actual_bidded_on, :bidded_amount, :plan_sign_on, :actual_sign_on, :sign_amount, :plan_deploy_on, :actual_deploy_on, :plan_check_on,
+       :actual_check_on, :prepayment_plan_on, :prepayment_actual_on, :prepayment_amount, :check_fee_plan_on, :check_fee_actual_on, :check_fee, :qa_plan_on, :qa_actual_on, :qa_amount, :account_receivable)
+    end
+
   end
 end

data/app/controllers/educode_sales/recycles_controller.rb

@@ -83,7 +83,7 @@ module EducodeSales
     end
 
     def monthPlan
-      @monthPlans = Recycle.where(source_type:"EducodeSales::SalePlan")
+      @monthPlans = Recycle.joins("JOIN educode_sales_sale_plans ON educode_sales_sale_plans.id = educode_sales_recycles.source_id AND educode_sales_sale_plans.month IS NOT NULL AND educode_sales_sale_plans.weekly IS NULL").where(source_type:"EducodeSales::SalePlan")
       if params[:sort].present? && params[:sort][:field]
         @monthPlans = @monthPlans.order("created_at #{params[:sort][:order]}")
       else
@@ -91,5 +91,15 @@ module EducodeSales
       end
       @monthPlans = @monthPlans.page(params[:page]).per(params[:limit])
     end
+
+    def yearPlan
+      @plans = Recycle.joins("JOIN educode_sales_sale_plans ON educode_sales_sale_plans.id = educode_sales_recycles.source_id AND educode_sales_sale_plans.year IS NOT NULL").where(source_type:"EducodeSales::SalePlan")
+      if params[:sort].present? && params[:sort][:field]
+        @plans = @plans.order("created_at #{params[:sort][:order]}")
+      else
+        @plans = @plans.order("educode_sales_recycles.created_at desc")
+      end
+      @plans = @plans.page(params[:page]).per(params[:limit])
+    end
 end
 end