educode_sales 0.7.0 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c243136aa29c06071bc7f5178e7c6eab7a7711c29a664ed12b4141b823102e1
-  data.tar.gz: db224456ae6c27346fadb5ae65b2ed6973ba11e1c384f2b833f994e6371540cb
+  metadata.gz: 32e3ce754e3aeac0c5f424b9188254b88b1da494feb591b5eb1e2d100f0362c2
+  data.tar.gz: 2be5f9d03ccc4781ff534e59ffe8aee273185a0d635c08ca09e60403a4b4d221
 SHA512:
-  metadata.gz: a5df7256338dc4a0bcc7f3ef6933c573f79b186a77ba12fcb10bcbfc80a11cfb3253d57ae2ea2325346a76c089fe9c9a71751407697bb4e3706ee6b58e11abf1
-  data.tar.gz: fa152803f2738331a1324e530275b6c31ff0420f5f725c537587b754555ae6eaeb0ce4bf5e522ef81ae109224e74b65effdf4435e7cb71e88fd11d6409c42580
+  metadata.gz: ec4b1594bcc4ac5766e6e3c0fc189f17b8b24b0789328ee1ed75a33022438b6d5f2c2c78f221ae6bf3db2dbb9b4253f7d5f428df24f6c336aa0a3ea5bd081aaf
+  data.tar.gz: '082c2c1a08570db3b4ea942c932c73ad08fd2e2bde8b4be2cff38816a4d3eed64bf503fb151ece68a0140e2db841c153923335fcf10d1142370b41f8f6a10a2f'

data/app/controllers/educode_sales/businesses_controller.rb

@@ -152,11 +152,16 @@ module EducodeSales
               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 (?)", params[:q][:business_step].split(",").map(&:to_i))
           end
-          if  params[:q].present? && params[:q][:place_id].present?
+          if params[:q].present? && params[:q][:place_id].present?
             @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.place_id = ?", params[:q][:place_id])
           end
+          if params[:q].present? && params[:q][:business_year].present?
+            @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.year = ?", params[:q][:business_year])
+          end
 
           if params[:q].present? && params[:q][:area].present?
             p = EducodeSales::Common.find(params[:q][:area]).name
@@ -193,7 +198,11 @@ module EducodeSales
           end
 
           if params[:sort].present? && params[:sort][:field]
-            @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+            if params[:sort][:field] = "service_end_time"
+              @businesses = @businesses.order("service_time_long #{params[:sort][:order]}")
+            else
+              @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+            end
           else
             @businesses = @businesses.order("educode_sales_businesses.created_at desc")
           end
@@ -203,9 +212,13 @@ module EducodeSales
           @businesses = @businesses.select("
             educode_sales_businesses.*,
             last_follow.invitation_at,
+            last_follow.service_time_long,
+            last_follow.service_end_time,
+            last_follow.service_start_time,
             last_follow.reception_at,
             last_follow.bidded_date,
             last_follow.signed_date,
+            last_follow.year,
             last_follow.created_at as latest_time,
             last_follow.actual_amount,
             (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
@@ -370,7 +383,7 @@ module EducodeSales
           render layout: false
         end
         format.json do
-          @records = BusinessExportRecord.all.page(params[:page]).per(params[:limit])
+          @records = BusinessExportRecord.all.order(id: :desc).page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -553,6 +566,9 @@ module EducodeSales
             educode_sales_businesses.*,
             last_follow.invitation_at,
             last_follow.reception_at,
+            last_follow.service_time_long,
+            last_follow.service_end_time,
+            last_follow.service_start_time,
             last_follow.bidded_date,
             last_follow.signed_date,
             last_follow.created_at as latest_time,

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -20,7 +20,7 @@ module EducodeSales
               business_ids = @businesses.pluck(:id)
               @follow_ups = FollowUp.where(business_id: business_ids)
             when '区域'
-              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
               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)
               business_ids = @businesses.pluck(:id)
@@ -63,11 +63,17 @@ module EducodeSales
     def create
       load_business
       follow_up = @business.follow_ups.build(follow_up_params)
+      if params[:service_time].present?
+        date = params[:service_time].split(" - ")
+        follow_up.service_start_time = date[0]
+        follow_up.service_end_time = date[1]
+        follow_up.service_time_long = (date[1].to_date - date[0].to_date).to_i
+      end
       follow_up.staff = @current_admin
       params[:assign_follow_up].each do |d|
         follow_up.assign_follow_ups.build(staff_id: d)
       end
-      
+
       follow_up.profit_amount = follow_up.actual_amount - (follow_up.divide_amount.to_i) if follow_up.actual_amount
       if follow_up.save
         if @business.last_follow_up.present?
@@ -95,7 +101,7 @@ module EducodeSales
       business = follow_up.business
       if follow_up.soft_destroy(@current_admin.id)
         if follow_up.id == business.last_follow_up_id
-          business.update(last_follow_up: business.follow_ups.last, return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: business.follow_ups.last&.id).sum(:amount))
+          business.update(last_follow_up: business.follow_ups.last, return_money: MoneyPlan.where(clazz: '实际回款', follow_up_id: business.follow_ups.last&.id).sum(:amount))
         end
         render_success
       else
@@ -106,6 +112,12 @@ module EducodeSales
     def update
       follow_up = FollowUp.find(params[:id])
       follow_up.assign_attributes(follow_up_params)
+      if params[:service_time].present?
+        date = params[:service_time].split(" - ")
+        follow_up.service_start_time = date[0]
+        follow_up.service_end_time = date[1]
+        follow_up.service_time_long = (date[1].to_date - date[0].to_date).to_i
+      end
       assign_follow_ups = []
       params[:assign_follow_up].each do |d|
         assign_follow_ups << follow_up.assign_follow_ups.find_or_initialize_by(staff_id: d)

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -21,11 +21,11 @@ module EducodeSales
             when '自己'
               @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.id)
             when '区域'
-              a_ids = MoneyPlan.where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.id).ids
+              a_ids = MoneyPlan.where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.id).pluck(:follow_up_id)
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
               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("educode_sales_follow_ups.clazz_id != ?", x_id).where(id: ids)
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: ids)
             else
               @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids)
             end

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -20,8 +20,11 @@ module EducodeSales
             when '自己'
               @sale_plans = OperationPlan.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?) OR schools.id in (?)", @current_admin.areas.pluck(:name), StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)).pluck(:id)
-              @sale_plans = OperationPlan.where("staff_id in (?) OR educode_sales_operation_plans.staff_id = ?", staff_ids, @current_admin.id)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
+              school_ids = StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
+              department_ids = Department.where(school_id: school_ids).pluck(:id)
+              teacher_ids = Teacher.where(department_id: department_ids).pluck(:id)
+              @sale_plans = OperationPlan.where("staff_id in (?) OR educode_sales_operation_plans.staff_id = ? OR educode_sales_operation_plans.teacher_id in (?)", staff_ids, @current_admin.id,teacher_ids)
             else
               @sale_plans = OperationPlan
             end

data/app/controllers/educode_sales/plans_controller.rb

@@ -21,8 +21,9 @@ module EducodeSales
             when '自己'
               @sale_plans = SalePlan.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?) OR schools.id in (?)", @current_admin.areas.pluck(:name),StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)).pluck(:id)
-              @sale_plans = SalePlan.where("staff_id in (?) OR educode_sales_sale_plans.staff_id = ?", staff_ids, @current_admin.id)
+              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("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

data/app/controllers/educode_sales/results_controller.rb

@@ -0,0 +1,54 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class ResultsController < ApplicationController
+
+    def index
+      respond_to do |format|
+        format.html do
+        end
+        format.json do
+          # @commons = Common.group("clazz").page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    # def create
+    #   common = Common.new(name: params[:name], clazz: params[:clazz])
+    #   if common.save
+    #     render_success
+    #   else
+    #     render_failure common
+    #   end
+    # end
+    #
+    # def edit
+    #   @common = Common.find(params[:id])
+    #   render layout: false
+    # end
+    #
+    # def update
+    #   common = Common.find(params[:id])
+    #   if common.update(common_params)
+    #     render_success
+    #   else
+    #     render_failure common
+    #   end
+    # end
+    #
+    # def new
+    #   render layout: false
+    # end
+    #
+    # def show
+    #   commons = Common.find(params[:id])
+    #   @commons = Common.where(clazz: commons.clazz).order('position')
+    # end
+    #
+    # private
+    #
+    # def common_params
+    #   params.permit(:name, :position)
+    # end
+  end
+end