educode_sales 0.9.47 → 0.9.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f238eee39f7340e6339b2b26e6140ac62ce0da5da1f009dbcdc0a146b1566b8
-  data.tar.gz: 3fc72b20f031ecaa646083fcc34ca6d4a5702dd2cc770dc7ef83229f9f718674
+  metadata.gz: 991c62b2ec05619441690b9b61c2bfdc767facaeca2ec6e7e1389a1b28df77fd
+  data.tar.gz: bbd084aa585b81bb70b7b9fde8720b5e780f3db21ed9fde600de486e57845318
 SHA512:
-  metadata.gz: 3bb437ceeb215fae404672b90276d28c7d454d85815cf846d2c9f7ec9cdd5c32041ba3c4ef1f2f67edbc23192d091351d98009b0f649d174990c7cdd7de73d91
-  data.tar.gz: 641baf6fd5b3e9576401d7c0fc142d829237d01b4f3fc9bdc2bd43c91d0921935f51433b13fee229570be5a74b6112516dd5d2adc80851c0344e6e50a32a5eaa
+  metadata.gz: 80eaf5c8e779520520b470de676e98883da23576fc24bee8eb2583b482ee62859c7e443aa001787df94810c87cb3769585904202d31e261b4b43e6125b16c387
+  data.tar.gz: 2a6931fcbc1fc4ac9936dcafc42b46d6eb5e479fb6d6b799eea674b01351f9edcfd746e96d1eeceda5aee996c54efcaf6c3ef2bbedbd5c2eaddc7cb5dafbbae0

data/app/controllers/educode_sales/idea_recycles_controller.rb

@@ -0,0 +1,100 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class IdeaRecyclesController < ApplicationController
+
+    before_action :find_idea, only: [:edit, :destroy, :detail, :history]
+
+    def index
+      respond_to do |format|
+        format.html do
+          staff_ids = EducodeSales::Idea.all.pluck(:staff_id)
+          creator_ids = EducodeSales::Idea.all.pluck(:creator_id)
+          @creator_arr = EducodeSales::Staff.joins(:user).where(id: creator_ids).pluck("concat(users.lastname,users.firstname)", :id)
+          @staff_arr = EducodeSales::Staff.joins(:user).where(id: staff_ids).pluck("concat(users.lastname,users.firstname)", :id)
+        end
+        format.json do
+          @ideas = Idea.deleted
+
+          if params[:q] && params[:q][:created_at].present?
+            date = params[:q][:created_at].split(" - ")
+            @ideas = @ideas.where("educode_sales_ideas.created_at >= ? AND educode_sales_ideas.created_at <= ?", date[0], date[1])
+          end
+          if params[:q].present? && params[:q][:name].present?
+            @ideas = @ideas.where("educode_sales_ideas.name like ?", "%#{params[:q][:name]}%")
+          end
+          if params[:q].present? && params[:q][:school].present?
+            @ideas = @ideas.left_joins(:school).where("schools.name like ?", "%#{params[:q][:school]}%")
+          end
+          if params[:q].present? && params[:q][:creator_id].present?
+            @ideas = @ideas.where("educode_sales_ideas.creator_id = ?", params[:q][:creator_id].to_i)
+          end
+          if params[:q].present? && params[:q][:staff_id].present?
+            @ideas = @ideas.where("educode_sales_ideas.staff_id = ?", params[:q][:staff_id].to_i)
+          end
+          if params[:q].present? && params[:q][:status].present?
+            @ideas = @ideas.where(status: params[:q][:status])
+          end
+          if params[:q].present? && params[:q][:types].present?
+            @ideas = @ideas.where(types: params[:q][:types])
+          end
+          if params[:q].present? && params[:q][:model].present?
+            @ideas = @ideas.where(model: params[:q][:model])
+          end
+          if params[:q].present? && params[:q][:history_type].present?
+            if params[:q][:history_type].to_i == 0
+              @ideas = @ideas.where("educode_sales_ideas.history_type=#{params[:q][:history_type]} or educode_sales_ideas.history_type is null ")
+            else
+              @ideas = @ideas.where(history_type: params[:q][:history_type])
+            end
+          end
+          if params[:q].present? && params[:q][:level].present?
+            @ideas = @ideas.where(level: params[:q][:level])
+          end
+
+          @ideas = @ideas.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def new
+      render layout: false
+    end
+
+    def create
+    end
+
+    def detail
+      render layout: false
+    end
+
+    def history
+      render layout: false
+    end
+
+    def update
+    end
+
+    def destroy
+      @idea.recycle
+      render_success
+    end
+
+    def edit
+    end
+
+    private
+
+    def idea_params
+      params.permit(:school_id, :name, :level, :staff_id,
+                    :status, :types, :model, :hardware, :project,
+                    :money, :end_time, :content, :department_id,
+                    :manager_name, :manager_phone)
+    end
+
+    def find_idea
+      @idea = Idea.find(params[:id])
+    end
+
+  end
+end

data/app/controllers/educode_sales/ideas_controller.rb

@@ -0,0 +1,130 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class IdeasController < ApplicationController
+
+    before_action :find_idea, only: [:edit, :destroy, :detail, :history, :update]
+
+    def index
+      respond_to do |format|
+        format.html do
+          staff_ids = EducodeSales::Idea.all.pluck(:staff_id)
+          creator_ids = EducodeSales::Idea.all.pluck(:creator_id)
+          @creator_arr = EducodeSales::Staff.joins(:user).where(id: creator_ids).pluck("concat(users.lastname,users.firstname)", :id)
+          @staff_arr = EducodeSales::Staff.joins(:user).where(id: staff_ids).pluck("concat(users.lastname,users.firstname)", :id)
+        end
+        format.json do
+          @ideas = Idea.not_deleted
+
+          if params[:q] && params[:q][:created_at].present?
+            date = params[:q][:created_at].split(" - ")
+            @ideas = @ideas.where("educode_sales_ideas.created_at >= ? AND educode_sales_ideas.created_at <= ?", date[0], date[1])
+          end
+          if params[:q].present? && params[:q][:name].present?
+            @ideas = @ideas.where("educode_sales_ideas.name like ?", "%#{params[:q][:name]}%")
+          end
+          if params[:q].present? && params[:q][:school].present?
+            @ideas = @ideas.left_joins(:school).where("schools.name like ?", "%#{params[:q][:school]}%")
+          end
+          if params[:q].present? && params[:q][:creator_id].present?
+            @ideas = @ideas.where("educode_sales_ideas.creator_id = ?", params[:q][:creator_id].to_i)
+          end
+          if params[:q].present? && params[:q][:staff_id].present?
+            @ideas = @ideas.where("educode_sales_ideas.staff_id = ?", params[:q][:staff_id].to_i)
+          end
+          if params[:q].present? && params[:q][:status].present?
+            @ideas = @ideas.where(status: params[:q][:status])
+          end
+          if params[:q].present? && params[:q][:types].present?
+            @ideas = @ideas.where(types: params[:q][:types])
+          end
+          if params[:q].present? && params[:q][:model].present?
+            @ideas = @ideas.where(model: params[:q][:model])
+          end
+          if params[:q].present? && params[:q][:history_type].present?
+            if params[:q][:history_type].to_i == 0
+              @ideas = @ideas.where("educode_sales_ideas.history_type=#{params[:q][:history_type]} or educode_sales_ideas.history_type is null ")
+            else
+              @ideas = @ideas.where(history_type: params[:q][:history_type])
+            end
+          end
+          if params[:q].present? && params[:q][:level].present?
+            @ideas = @ideas.where(level: params[:q][:level])
+          end
+
+          @ideas = @ideas.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def new
+      gon.department = { value: '', name: '' }
+      gon.value = ''
+      render layout: false
+    end
+
+    def create
+      idea = Idea.new(idea_params)
+      idea.school_id = Department.find_by_id(idea.department_id)&.school_id
+      idea.creator = current_user
+      idea.save
+      render_success
+    end
+
+    def detail
+      render layout: false
+    end
+
+    def history
+      render layout: false
+    end
+
+    def update
+      @idea.assign_attributes(idea_params)
+      @idea.school_id = Department.find_by_id(@idea.department_id)&.school_id
+      check_changes
+      @idea.save
+      render_success
+    end
+
+    def destroy
+      @idea.soft_destroy(current_user.id)
+      render_success
+    end
+
+    def edit
+      gon.department = { value: @idea&.department_id, name: "#{@idea&.department&.school&.name}-#{@idea&.department&.name}" }
+      gon.value = @idea.department_id
+      render layout: false
+    end
+
+    private
+
+    def idea_params
+      params.permit(:name, :level, :staff_id,
+                    :status, :types, :model, :hardware, :project,
+                    :money, :end_time, :content, :department_id,
+                    :manager_name, :manager_phone)
+    end
+
+    def find_idea
+      @idea = Idea.find(params[:id])
+    end
+
+    def check_changes
+      unless @idea.new_record?
+        history = []
+        arr = @idea.attributes.except(:creator_id, :id, :history_type, :deleter_id, :is_deleted, :deleted_at, :history_record, :created_at, :updated_at).keys
+        arr.each do |attr|
+          if @idea.send("#{attr}_changed?")
+            old_value, new_value = @idea.send("#{attr}_was"), @idea.send(attr)
+            res = @idea.save_history(attr, old_value, new_value)
+            history << res if res
+          end
+        end
+        @idea.idea_histories.create(content: history, staff: current_user) if history.present?
+      end
+    end
+
+  end
+end

data/app/controllers/educode_sales/logs_controller.rb

@@ -0,0 +1,21 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class LogsController < ApplicationController
+    def index
+      respond_to do |format|
+        format.html do
+        end
+        format.json do
+          @logs = Impression.where(impressionable_type: "EducodeSales::Staff")
+          if params[:sort].present? && params[:sort][:field]
+            @logs = @logs.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @logs = @logs.order("created_at desc")
+          end
+          @logs = @logs.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+  end
+end

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -15,7 +15,7 @@ module EducodeSales
         follow_up.courses_count = course_ids.size
       end
       if follow_up.save
-        @teacher.update(follow_up_id: follow_up.id)
+        @teacher.update(follow_up_id: follow_up.id, followup_at: Time.now)
         render_success
       else
         render_failure follow_up
@@ -41,6 +41,86 @@ module EducodeSales
       end
     end
 
+    def index
+      @staff_manages = {}
+      role = EducodeSales::Role.find_by(name: '生态经理')
+      EducodeSales::Common.joins(market_areas: :staff).includes(market_areas: :staff).where(clazz: '区域').where("educode_sales_staffs.role_id = #{role.id}").each do |d|
+        @staff_manages[d.name] = d.market_areas.map { |d| d.staff&.user&.real_name }.uniq.compact
+      end if role
+
+      if @current_admin.is_admin?
+        @follow_ups = TeacherFollow.all
+      else
+        level = @current_admin.role.role_areas.find_by(clazz: '教师运营').level
+        case level
+        when '自己'
+          @follow_ups = TeacherFollow.where(staff_id: @current_admin.id)
+        when '区域'
+          school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+          teacher_ids = EducodeSales::Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_teachers.staff_id = #{@current_admin.id}", school_ids).pluck(:id)
+          @follow_ups = TeacherFollow.where(teacher_id: teacher_ids)
+        else
+          @follow_ups = TeacherFollow.all
+        end
+      end
+      if params[:q].present? && params[:q][:name].present?
+        @follow_ups = @follow_ups.joins(:teacher).where("educode_sales_teachers.name LIKE ?", "%#{params[:q][:name]}%")
+      end
+
+      if params[:q].present? && params[:q][:staff_id].present?
+        staff = Staff.find(params[:q][:staff_id])
+        school_ids = School.where(province: staff.areas.pluck(:name)).pluck(:id)
+        teacher_ids = EducodeSales::Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where("departments.school_id in (?)", school_ids).pluck(:id)
+        @follow_ups = TeacherFollow.where(teacher_id: teacher_ids)
+      end
+
+      if params[:q].present? && params[:q][:department].present?
+        departments_ids = Department.joins(:school).where("schools.name like ?", "%#{params[:q][:department]}%").pluck(:id)
+        @follow_ups = @follow_ups.joins(:teacher).where("department_id in (?)", departments_ids)
+      end
+
+      if params[:q].present? && params[:q][:area].present?
+        p = EducodeSales::Common.find(params[:q][:area]).name
+        # if @current_admin.is_admin?
+          @follow_ups = @follow_ups.joins(:teacher).joins("
+            JOIN departments ON educode_sales_teachers.department_id = departments.id
+            JOIN schools ON departments.school_id = schools.id
+          ").where("province = ?", p)
+        # else
+        #   level = @current_admin.role.role_areas.find_by(clazz: '教师运营').level
+        #   if level == "区域"
+        #     school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+        #     @follow_ups = @follow_ups.joins(:teacher).joins("
+        #       JOIN departments ON educode_sales_teachers.department_id = departments.id
+        #       JOIN schools ON departments.school_id = schools.id
+        #     ").where("province = ? AND departments.school_id in (?)", p, school_ids)
+        #   else
+        #     @follow_ups = @follow_ups.joins(:teacher).joins("
+        #       JOIN departments ON educode_sales_teachers.department_id = departments.id
+        #       JOIN schools ON departments.school_id = schools.id
+        #     ").where("province = ?", p)
+        #   end
+        # end
+      end
+
+      if params[:q].present? && params[:q][:description].present?
+        @follow_ups = @follow_ups.where("educode_sales_teacher_follows.description LIKE ?" ,"%#{params[:q][:description]}%")
+      end
+
+      if params[:q].present? && params[:q][:follows_date].present?
+        date = params[:q][:follows_date].split(" - ")
+        @follow_ups = @follow_ups.where("educode_sales_teacher_follows.created_at > ? AND educode_sales_teacher_follows.created_at < ?", date[0], date[1] + ' 23:59:59')
+      end
+
+      @follow_ups =  @follow_ups.includes(:teacher, :attitude, :staff)
+      if params[:sort].present? && params[:sort][:field]
+        @follow_ups = @follow_ups.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+      else
+        @follow_ups = @follow_ups.order("educode_sales_teacher_follows.created_at desc")
+      end
+       @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
+    end
+
     private
 
     def load_teacher
@@ -48,7 +128,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:attitude_id, :follow_id, :course_plan_id, :course_build_id, :description)
+      params.permit(:attitude_id, :follow_id, :course_plan_id, :course_build_id, :description, :advise)
     end
 
   end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -22,6 +22,13 @@ module EducodeSales
       respond_to do |format|
         format.html do
           common = Common.find_by(clazz: 'staff_type', name: '运营')
+          role = EducodeSales::Role.find_by(name: '生态经理')
+          if role
+            @staff_manage = Staff.joins(:user).where(role_id: role.id).map { |d| [d.user.real_name, d.id]}
+          else
+            @staff_manage = Staff.none
+          end
+          
           @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
           @more = can?(:create, EducodeSales::OperationPlan) || can?(:update, EducodeSales::Teacher) || can?(:destroy, EducodeSales::Teacher)
           gon.menus = []
@@ -37,6 +44,12 @@ module EducodeSales
           end
         end
         format.json do
+          @staff_manages = {}
+          role = EducodeSales::Role.find_by(name: '生态经理')
+          EducodeSales::Common.joins(market_areas: :staff).includes(market_areas: :staff).where(clazz: '区域').where("educode_sales_staffs.role_id = #{role.id}").each do |d|
+            @staff_manages[d.name] = d.market_areas.map { |d| d.staff&.user&.real_name }.uniq.compact
+          end if role
+          
           if @current_admin.is_admin?
             @teachers = Teacher.where(is_key: false)
           else
@@ -62,8 +75,6 @@ module EducodeSales
             @teachers = @teachers.where.not(id: public_teacher_ids)
           end
 
-
-
           if params[:q].present? && params[:q][:assist].present?
             staff_id = params[:q][:assist].to_i
             teacher_ids = EducodeSales::TeacherAssignFollow.where(staff_id: staff_id).pluck(:teacher_id)
@@ -116,8 +127,12 @@ module EducodeSales
           @teachers = @teachers.select("
             educode_sales_teachers.*,
             users.created_on,
+            last_follow.created_at as latest_time,
+            users.grade,
+            users.experience,
             users.last_login_on").joins("
             LEFT JOIN users ON educode_sales_teachers.user_id = users.id
+            LEFT JOIN educode_sales_teacher_follows AS last_follow ON last_follow.teacher_id = educode_sales_teachers.id AND last_follow.deleted_at IS NULL
           ")
           if params[:sort].present? && params[:sort][:field]
             @teachers = @teachers.order("#{params[:sort][:field]} #{params[:sort][:order]}")
@@ -337,7 +352,7 @@ module EducodeSales
 
     private
     def teacher_params
-      params.permit(:name, :professional_title, :job, :source_id, :wechat)
+      params.permit(:name, :professional_title, :job, :source_id, :wechat, :mobile)
     end
 
     def load_teacher

data/app/models/educode_sales/common.rb

@@ -2,6 +2,8 @@ module EducodeSales
   class Common < ApplicationRecord
     acts_as_list scope: [:clazz]
 
+    has_many :market_areas, class_name: 'MarketArea', foreign_key: 'area_id'
+
     XTYPE = "x_class"
     OTYPE = 'o_class'
     ATYPE = 'a_class'

data/app/models/educode_sales/idea.rb

@@ -0,0 +1,87 @@
+module EducodeSales
+  class Idea < ApplicationRecord
+    belongs_to :department, optional: true
+    belongs_to :staff, optional: true
+    belongs_to :school, optional: true
+    belongs_to :creator, class_name: 'Staff', optional: true
+    belongs_to :deleter, class_name: 'Staff', optional: true
+
+    has_many :idea_histories, dependent: :destroy
+
+    scope :deleted, -> { where(is_deleted: true) }
+    scope :not_deleted, -> { where(is_deleted: false) }
+
+    enum level: %w[高 中 低]
+    enum status: %w[已完成 未完成]
+    enum types: %w[定制 非定制]
+    enum model: %w[本地版 线上版 混合版]
+
+    # before_save :check_changes
+
+    def recycle
+      self.update(deleted_at: nil, deleter_id: nil, is_deleted: false)
+    end
+
+    def soft_destroy(staff_id)
+      self.update(deleted_at: Time.now, deleter_id: staff_id, is_deleted: true)
+    end
+
+    # def check_changes
+    #   unless self.new_record?
+    #     history = []
+    #     arr = self.attributes.except(:creator_id, :id, :history_type, :deleter_id, :is_deleted, :deleted_at, :history_record, :created_at, :updated_at).keys
+    #     arr.each do |attr|
+    #       if self.send("#{attr}_changed?")
+    #         old_value, new_value = self.send("#{attr}_was"), self.send(attr)
+    #         res = save_history(attr, old_value, new_value)
+    #         history << res if res
+    #       end
+    #     end
+    #     self.idea_histories.create(content: history, staff: current_user)
+    #   end
+    # end
+
+    def save_history(attr, old_value, new_value)
+      case attr
+      when "school_id"
+        old_value = School.find_by(id: old_value)&.name
+        new_value = School.find_by(id: new_value)&.name
+        "学校/单位由“#{old_value}”变更为“#{new_value}”"
+      when "name"
+        "项目名称由“#{old_value}”变更为“#{new_value}”"
+      when "level"
+        "优先级由“#{old_value}”变更为“#{new_value}”"
+      when "staff_id"
+        old_value = Staff.find_by(id: old_value)&.user&.real_name
+        new_value = Staff.find_by(id: new_value)&.user&.real_name
+        "指派人由“#{old_value}”变更为“#{new_value}”"
+      when "status"
+        "状态由“#{old_value}”变更为“#{new_value}”"
+      when "types"
+        "类型由“#{old_value}”变更为“#{new_value}”"
+      when "model"
+        "部署模式由“#{old_value}”变更为“#{new_value}”"
+      when "hardware"
+        "硬件规模(万)由“#{old_value}”变更为“#{new_value}”"
+      when "project"
+        "项目规模(人)由“#{old_value}”变更为“#{new_value}”"
+      when "money"
+        "项目预算(万)由“#{old_value}”变更为“#{new_value}”"
+      when "end_time"
+        "截止时间由“#{old_value}”变更为“#{new_value}”"
+      when "content"
+        "反馈情况由“#{old_value}”变更为“#{new_value}”"
+      when "department_id"
+        old_value = Department.find_by(id: old_value)&.name
+        new_value = Department.find_by(id: new_value)&.name
+        "院系/部门由“#{old_value}”变更为“#{new_value}”"
+      when "manager_name"
+        "学校负责人由“#{old_value}”变更为“#{new_value}”"
+      when "manager_phone"
+        "负责人电话由“#{old_value}”变更为“#{new_value}”"
+      else
+        nil
+      end
+    end
+  end
+end

data/app/models/educode_sales/idea_history.rb

@@ -0,0 +1,8 @@
+module EducodeSales
+  class IdeaHistory < ApplicationRecord
+    belongs_to :idea
+    belongs_to :staff
+
+    serialize :content, Array
+  end
+end

data/app/views/educode_sales/businesses/get_export_data.json.jbuilder

@@ -3,13 +3,13 @@ json.data do
     json.id d.id
     json.number d.number
     json.name d.name
-    json.department d.department.name
-    json.school d.department.school.name
-    json.school_id d.department.school.id
+    json.department d.department&.name
+    json.school d.department&.school&.name
+    json.school_id d.department&.school_id
     follow_ups_count = d['follow_ups_count'] || 0
     json.follow_ups_count follow_ups_count
     json.follow_up_id d.last_follow_up_id
-    json.clazz d.last_follow_up&.clazz&.name || ""
+    json.clazz d.clazz&.name || ""
     json.stage d.last_follow_up&.stage&.name
     json.invitation_at d.last_follow_up&.invitation_at.to_s
     json.reception_at d.last_follow_up&.reception_at.to_s
@@ -27,17 +27,22 @@ json.data do
     json.divide_rate d.divide_rate
     json.divide_money d.divide_amount
     json.budget_amount d.budget_amount
-    json.area d.department.school.province
-    school_property = d.department.school.school_property
-    property = []
+    json.area d.department&.school&.province
+    # school_property = d.department&.school&.school_property
+    # property = []
 
-    if school_property.present?
-      property << '本科地方院校' if school_property.regular_college || school_property.project_985 ||  school_property.project_211
-      property << '高职' if school_property.junior_college || school_property.secondary_school
-      property << '本科军校' if school_property.military_school
-      property << '企业' if school_property.enterprise
+    # if school_property.present?
+    #   property << '本科地方院校' if school_property.regular_college || school_property.project_985 ||  school_property.project_211
+    #   property << '高职' if school_property.junior_college || school_property.secondary_school
+    #   property << '本科军校' if school_property.military_school
+    #   property << '企业' if school_property.enterprise
+    # end
+    # json.property property.join("、")
+    if d.department&.school
+      json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+    else
+      json.property ''
     end
-    json.property property.join("、")
     json.sale_way d.last_follow_up&.place&.name.present? ? '渠道' : '直销'
     json.actual_amount d.last_follow_up&.actual_amount.to_f.round(2)
     json.return_money d.return_money

data/app/views/educode_sales/businesses/index.json.jbuilder

@@ -5,9 +5,9 @@ json.data do
     json.id d.id
     json.number d.number
     json.name d.name
-    json.department d.department.name
-    json.school d.department.school.name
-    json.school_id d.department.school.id
+    json.department d.department&.name
+    json.school d.department&.school&.name
+    json.school_id d.department&.school_id
     follow_ups_count = d['follow_ups_counts'] || 0
     json.follow_ups_count follow_ups_count
     follow_count += follow_ups_count
@@ -27,7 +27,7 @@ json.data do
     json.divide_rate d.divide_rate
     json.divide_money d.divide_amount.to_f.round(2)
     json.budget_amount d.budget_amount.to_f.round(2)  #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0
-    json.area d.department.school.province
+    json.area d.department&.school&.province
     # school_property = d.department.school.school_property
     # property = []
 

data/app/views/educode_sales/idea_recycles/activities.json.jbuilder

@@ -0,0 +1,9 @@
+json.data do
+  json.array! @activities do |d|
+    json.id d.id
+    json.name d.name
+    json.start_at d.start_at.to_s
+  end
+end
+json.code 0
+json.msg 'succcess'