educode_sales 0.9.46 → 0.9.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7444b7d61d8ff5a5677b765e4d0580a49a3b425de52ffec51e0f4bce62b5d125
-  data.tar.gz: 2752a018874ad957014ceff871ee1ef7cb77d8ea0300c0da9a1112344c579d51
+  metadata.gz: 7f238eee39f7340e6339b2b26e6140ac62ce0da5da1f009dbcdc0a146b1566b8
+  data.tar.gz: 3fc72b20f031ecaa646083fcc34ca6d4a5702dd2cc770dc7ef83229f9f718674
 SHA512:
-  metadata.gz: 5a4e87f3e97aa8604d7656e36e044943129e6ee19414bc5a2ba2d6d5d1f8150797d9a0cd0e254693f74535cde2d1f9aa9eb27027cdb2f6dfae548c3bd1276435
-  data.tar.gz: 05c6ce1070251dd40fb903ef901517228ebaddaa7690d84ac94f141768e6c065c0c31b7785d0eea71dc9aacba98ff548fb699b6a595a5877056c9b2a308c84d4
+  metadata.gz: 3bb437ceeb215fae404672b90276d28c7d454d85815cf846d2c9f7ec9cdd5c32041ba3c4ef1f2f67edbc23192d091351d98009b0f649d174990c7cdd7de73d91
+  data.tar.gz: 641baf6fd5b3e9576401d7c0fc142d829237d01b4f3fc9bdc2bd43c91d0921935f51433b13fee229570be5a74b6112516dd5d2adc80851c0344e6e50a32a5eaa

data/app/controllers/educode_sales/businesses_controller.rb

@@ -97,17 +97,20 @@ module EducodeSales
         format.json do
           if params[:q] && (params[:q][:clazz] == 'area' || params[:q][:clazz] == 'special')
             if params[:q][:clazz] == 'special'
-            school_ids = []
-            # 专项商机
-            school_tag_ids = @current_admin.staff_school_tags.pluck(:school_tag_id)
-            school_ids = SchoolTagMiddle.where(school_tag_id: school_tag_ids).pluck(:school_id)
-            @businesses = Business.joins("JOIN departments AS dp ON educode_sales_businesses.department_id = dp.id").where("dp.school_id in (?)", school_ids)
-          elsif params[:q][:clazz] == 'area'
-            school_ids = []
-            # 区域管理商机
-            school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
-            @businesses = Business.joins("JOIN departments  AS dp ON educode_sales_businesses.department_id = dp.id").where("dp.school_id in (?)", school_ids)
-          end
+              school_ids = []
+              # 专项商机
+              school_tag_ids = @current_admin.staff_school_tags.pluck(:school_tag_id)
+              school_ids = SchoolTagMiddle.where(school_tag_id: school_tag_ids).pluck(:school_id)
+              @businesses = Business.joins("JOIN departments AS dp ON educode_sales_businesses.department_id = dp.id").where("dp.school_id in (?)", school_ids)
+            elsif params[:q][:clazz] == 'area'
+              school_ids = []
+              # 区域管理商机
+              # 排查看区域商机，需要排除掉其它人员手上的监管学校
+              other_staff_school_id = EducodeSales::StaffSchool.where.not(staff_id: @current_admin.id).where("school_id IN (SELECT school_id FROM educode_sales_staff_schools WHERE staff_id = #{@current_admin.id}) IS NOT TRUE").distinct.pluck :school_id
+               
+              school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id) - other_staff_school_id
+              @businesses = Business.joins("JOIN departments  AS dp ON educode_sales_businesses.department_id = dp.id").where("dp.school_id in (?)", school_ids)
+            end
           else
             if @current_admin.is_admin?
               @businesses = Business
@@ -118,8 +121,10 @@ 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.where("educode_sales_businesses.staff_id = ? OR educode_sales_businesses.id in (?)", @current_admin.id, business_ids)
               when '区域'
-              
-                school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
+                # 查看区域商机，需要排除掉其它人员手上的监管学校
+                other_staff_school_id = EducodeSales::StaffSchool.where.not(staff_id: @current_admin.id).where("school_id IN (SELECT school_id FROM educode_sales_staff_schools WHERE staff_id = #{@current_admin.id}) IS NOT TRUE").distinct.pluck :school_id
+               
+                school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id) - other_staff_school_id
                 if can?(:special, EducodeSales::Business)
                 # 专项商机
                   school_tag_ids = @current_admin.staff_school_tags.pluck(:school_tag_id)
@@ -178,9 +183,7 @@ module EducodeSales
             @businesses = EducodeSales::Business.where(id:business_ids)
           end
           if params[:q].present? && params[:q][:business_type].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.clazz_id in (?)", params[:q][:business_type].split(",").map(&:to_i))
+            @businesses = @businesses.where("educode_sales_businesses.clazz_id in (?)", params[:q][:business_type].split(",").map(&:to_i))
           end
           if params[:q].present? && params[:q][:business_step].present?
             @businesses = @businesses.joins("
@@ -332,7 +335,7 @@ module EducodeSales
 
     def create
       department = Department.find(params[:department_id])
-      business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id)
+      business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id, clazz_id: params[:clazz_id])
       if business.save
         render_success
       else
@@ -341,6 +344,7 @@ module EducodeSales
     end
 
     def new
+      @clazz = Common.where(clazz: 'business_type').order("position").pluck(:name, :id)
       render layout: false
     end
 
@@ -602,9 +606,7 @@ module EducodeSales
             @businesses = EducodeSales::Business.where(id:business_ids)
           end
           if params[:business_type].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.clazz_id in (?)", params[:business_type].split(",").map(&:to_i))
+            @businesses = @businesses.where("educode_sales_businesses.clazz_id in (?)", params[:business_type].split(",").map(&:to_i))
           end
           if params[:business_step].present?
             @businesses = @businesses.joins("

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -84,10 +84,10 @@ module EducodeSales
 
       follow_up.profit_amount = follow_up.actual_amount - (follow_up.divide_amount.to_i) if follow_up.actual_amount
       last_follow_up = @business.last_follow_up
-      if last_follow_up.present?
-        follow_up.clazz_changed = last_follow_up.clazz_id != follow_up.clazz_id
+      if @business.clazz.present?
+        follow_up.clazz_changed = @business.clazz_id != follow_up.clazz_id
         if follow_up.clazz_changed 
-          clazz_changes = "#{last_follow_up.clazz.extras.split('_')[0]}-#{follow_up.clazz.extras.split('_')[0]}"
+          clazz_changes = "#{@business.clazz.extras.split('_')[0]}-#{follow_up.clazz.extras.split('_')[0]}"
           business_clazz_change = EducodeSales::BusinessClazzChange.find_or_initialize_by(business_id: @business.id, clazz_changed: clazz_changes)
           business_clazz_change.save unless business_clazz_change.persisted?
         end
@@ -107,7 +107,7 @@ module EducodeSales
           end
 
         end
-        @business.update(last_follow_up_id: follow_up.id)
+        @business.update(last_follow_up_id: follow_up.id, clazz_id: follow_up.clazz_id)
         # 增加o商机编号
         add_business_number
         update_department
@@ -122,6 +122,9 @@ module EducodeSales
       business = follow_up.business
       if follow_up.soft_destroy(@current_admin.id)
         if follow_up.id == business.last_follow_up_id
+          if business.follow_ups.last&.clazz_id
+            business.clazz_id = business.follow_ups.last&.clazz_id
+          end
           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
@@ -148,6 +151,7 @@ module EducodeSales
       if follow_up.save
         # 增加o类商机
         @business = follow_up.business
+        @business.update(clazz_id: follow_up.clazz_id)
         add_business_number
         update_department
         render_success

data/app/controllers/educode_sales/teachers_controller.rb

@@ -192,7 +192,7 @@ module EducodeSales
         teacher_assists << teacher.teacher_assign_follows.find_or_initialize_by(staff_id: d)
       end
       teacher.teacher_assign_follows = teacher_assists
-      
+
       if params[:user_id].present?
         user = User.find(params[:user_id])
         teacher.user_id = user.id
@@ -212,7 +212,7 @@ module EducodeSales
         teacher = Teacher.find(params[:id])
         teacher.destroy
       end
-     
+
       render_success
     end
 
@@ -323,13 +323,18 @@ module EducodeSales
         @courses = Course.none
       end
     end
-    
+
 
     def activities
       teacher = Teacher.find(params[:id])
       @activities = teacher.activities.page(params[:page]).per(params[:limit])
     end
 
+    def daily_paper
+      @num_1 = @current_admin.operation_plans.where("month >= ? AND month < ?", Time.now.beginning_of_month, Time.now.end_of_month).count
+      render layout: false
+    end
+
     private
     def teacher_params
       params.permit(:name, :professional_title, :job, :source_id, :wechat)

data/app/models/educode_sales/business.rb

@@ -3,6 +3,7 @@ module EducodeSales
 
     validates_uniqueness_of :number ,allow_nil: true
 
+    belongs_to :clazz, class_name: 'Common'
     belongs_to :staff
     belongs_to :department
     belongs_to :last_follow_up, class_name: 'FollowUp', optional: true # 允许last_follow_up_id字段中的数为nil

data/app/views/educode_sales/activities/index.html.erb

@@ -226,7 +226,7 @@
 </script>
 <style>
     .layui-table-tool-temp{
-        padding-right: 0px; !important;
+        padding-right: 30px; !important;
     }
 
 </style>

data/app/views/educode_sales/activities/show_teachers.html.erb

@@ -1,4 +1,7 @@
 <div class="min-height-table">
+
+<table class="layui-hide" id="show_teachers_table" style="min-height: 300px;" lay-filter="teachers_table"></table>
+</div>
 <script type="text/html" id="teacher_toolbar">
   <div class="layui-btn-container">
     <span class="table-label">教师列表</span>
@@ -6,8 +9,6 @@
     </button>
   </div>
 </script>
-<table class="layui-hide" id="show_teachers_table" style="min-height: 300px;" lay-filter="teachers_table"></table>
-</div>
 <script type="text/html" id="show_teachersTableBar">
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
 </script>

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

@@ -12,7 +12,7 @@ json.data do
     json.follow_ups_count follow_ups_count
     follow_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.clazz_changed d.last_follow_up&.clazz_changed || false
     json.stage d.last_follow_up&.stage&.name
     json.invitation_at d.last_follow_up&.invitation_at.to_s
@@ -37,7 +37,7 @@ json.data do
     #   property << '本科军校' if school_property.military_school
     #   property << '企业' if school_property.enterprise
     # end
-    if d.department.school
+    if d.department&.school
       json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
     else
       json.property ''
@@ -51,7 +51,7 @@ json.data do
     json.wait_return_money d.wait_return_money.to_f.round(2)
     json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '实际回款').present? ? (d.last_follow_up.money_plans.where(clazz: '实际回款').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
     json.place d.last_follow_up&.place&.name
-    json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
+    json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff&.user&.real_name : d.staff&.user&.real_name
     json.source d.source
     json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
     json.current_staff_id @current_admin.id

data/app/views/educode_sales/businesses/new.html.erb

@@ -21,6 +21,13 @@
       <div class="layui-inline" style="padding-top: 20px">
         <p style="padding-left: 40px">请填写提供本商机的人名（如‘张明’）；如果为非头歌用户，请增加单位信息（如‘张明，华为公司’）</p>
       </div>
+      <br>
+      <div class="layui-inline" style="padding-top: 20px">
+        <label class="layui-form-label required">项目类型</label>
+        <div class="layui-input-inline">
+          <%= select_tag "clazz_id", options_for_select(@clazz), { 'lay-filter': 'clazz_id', class: 'required' } %>
+        </div>
+      </div>
     <div class="layui-form-item m-t-20">
       <div class="layui-input-block">
         <button class="layui-btn layui-btn-normal" lay-submit lay-filter="create_business">提交</button>
@@ -74,7 +81,8 @@
       request.authPost("missions/businesses", {
         department_id: add_department.getValue(),
         name: data.field.name,
-        source: data.field.source
+        source: data.field.source,
+        clazz_id: data.field.clazz_id,
 
       }, function (res) {
         if (res.success == false) {

data/app/views/educode_sales/teachers/daily_paper.html.erb

@@ -0,0 +1,68 @@
+<div style="padding: 15px;" id="day_content">
+  <h2>生态经理日报-转正后</h2>
+  <hr>
+  <div style="height: 450px;overflow: auto;">
+
+    <p>一、数据指标</p>
+    <p>1、【教师合作-老客户运营】</p>
+    <p>本月目标<%= @num_1 %>人；</p>
+    <p>累计完成xx人； </p>
+    <p>今日已完成沟通xx人；</p>
+    <p style="margin-bottom: 30px;">今日已完成新建课堂xx个；</p>
+    <p>2、【市场活动-新客户注册】</p>
+    <p>本月目标xx人；</p>
+    <p>累计完成xx人；</p>
+    <p style="margin-bottom: 30px;">今日已完成转化注册xx人；</p>
+    <p>3、课程建设-新型态教材合作】</p>
+    <p>本月目标xx门课程（教材）；</p>
+    <p>累计完成xx门课程（教材）；</p>
+    <p style="margin-bottom: 30px;">今日已完成挖掘xx门课程（教材）；</p>
+    <p>二、客户跟进情况</p>
+    <p style="margin-bottom: 30px;">（填写每日重点客户沟通内容，可涵盖总部安排的重要工作事项） </p>
+    <p>三、商机与项目线索</p>
+    <p style="margin-bottom: 30px;">（在运营过程中发现的商机以及小toB非招标项目商机：saas课程、在线考试等）</p>
+    <p>四、需要支持事宜索</p>
+    <p style="margin-bottom: 30px;">（业务上遇到的难点问题）</p>
+  </div>
+
+  <% text = "\n" %>
+  <% text += "一、数据指标\n" %>
+  <% text += "1、【教师合作-老客户运营】\n" %>
+  <% text += "本月目标xx人；\n" %>
+  <% text += "累计完成xx人；\n" %>
+  <% text += "今日已完成沟通xx人；\n" %>
+  <% text += "今日已完成新建课堂xx个；\n\n" %>
+  <% text += "2、【市场活动-新客户注册】\n" %>
+  <% text += "本月目标xx人\n" %>
+  <% text += "累计完成xx人\n" %>
+  <% text += "今日已完成挖掘xx门课程（教材）\n\n" %>
+  <% text += "3、课程建设-新型态教材合作】\n" %>
+  <% text += "本月目标xx门课程（教材）；\n" %>
+  <% text += "累计完成xx门课程（教材）；\n" %>
+  <% text += "今日已完成挖掘xx门课程（教材）；\n\n" %>
+  <% text += "二、客户跟进情况\n" %>
+  <% text += "（填写每日重点客户沟通内容，可涵盖总部安排的重要工作事项\n\n" %>
+  <% text += "三、商机与项目线索\n" %>
+  <% text += "（在运营过程中发现的商机以及小toB非招标项目商机：saas课程、在线考试等）\n\n" %>
+  <% text += "四、需要支持事宜索\n" %>
+  <% text += "（业务上遇到的难点问题）\n\n" %>
+  <% text += "头歌营销系统 \n"%>
+  <% text +=  "#{Time.now.to_s}"%>
+  <div id="content" style="display: none;" data-content="生态经理日报-转正后<%=text %>"></div>
+  <p>头歌营销系统</p>
+  <p><%= Time.now.to_s %></p>
+  <button type="button" onclick="copy()" style=" margin-right: 20px; float: right;" class="layui-btn layui-btn-primary">复制</button>
+</div>
+<script>
+function copy() {
+  var copyText = document.getElementById("content").dataset.content;
+  var textArea = document.createElement("textarea");
+  textArea.value = copyText;
+  document.body.appendChild(textArea);
+  textArea.select();
+  if (document.execCommand("Copy")) {
+    layer.msg('已复制到剪贴板');
+    textArea.remove();
+  }
+}
+</script>

data/app/views/educode_sales/teachers/index.html.erb

@@ -81,7 +81,11 @@
     <% if can? :create, EducodeSales::Teacher %>
       <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="import">导入数据</button>
       <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">添加老师</button>
-  <% end %>
+     <% end %>
+     <!-- <div class="layui-btn-container">
+      <span class="table-label">跟进动态</span>
+      <a class="layui-btn layui-btn-normal layui-btn-sm" style="margin-left: 20px;" lay-event="report_day">日报</a>
+    </div> -->
     <!-- <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="search_new"> 搜索添加 -->
     </button>
   </div>
@@ -117,7 +121,6 @@
   <a href="javascript:void(0);" lay-event="follow" class="layui-table-link">{{ d.teacher_follows_count }}</a>
 </script>
 
-
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {
         var $ = layui.jquery,
@@ -469,6 +472,21 @@
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
+            } else if (obj.event === 'report_day') {
+            content = miniPage.getHrefContent('/missions/teachers/daily_paper');
+              openWH = miniPage.getOpenWidthHeight();
+              index = layer.open({
+                  title: '',
+                  type: 1,
+                  shade: 0.2,
+                  // maxmin: true,
+                  shadeClose: true,
+                  area: ['600px', '600px'],
+                  content: content
+              });
+              $(window).on("resize", function () {
+                  layer.full(index);
+              });
             }
         });
 

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

@@ -9,7 +9,7 @@ json.data do
     json.professional_title d.professional_title
     json.job d.job
     json.user_id d.user_id
-    json.login d.user_id ? d.user.login : ''
+    json.login d.user&.login || ''
     json.course_subjects_count d.course_subjects_count
     json.teacher_follows_count d.teacher_follows_count
     json.activities_count d.activity_teachers_count

data/config/routes.rb

@@ -222,6 +222,7 @@ EducodeSales::Engine.routes.draw do
       get :edit_follow_record
       get :course_list
       get :activities
+      get :daily_paper
     end
 
     member do

data/db/migrate/20230220144737_add_clazz_id_to_business.rb

@@ -0,0 +1,8 @@
+class AddClazzIdToBusiness < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_businesses, :clazz_id, :integer
+    EducodeSales::Business.all.each do |d|
+      d.update(clazz_id: d.last_follow_up&.clazz_id)
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.46'
+  VERSION = '0.9.47'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.46
+  version: 0.9.47
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -409,6 +409,7 @@ files:
 - app/views/educode_sales/teachers/add_keys.html.erb
 - app/views/educode_sales/teachers/course_list.json.jbuilder
 - app/views/educode_sales/teachers/course_subject.json.jbuilder
+- app/views/educode_sales/teachers/daily_paper.html.erb
 - app/views/educode_sales/teachers/edit.html.erb
 - app/views/educode_sales/teachers/edit_follow_record.html.erb
 - app/views/educode_sales/teachers/import.html.erb
@@ -496,6 +497,7 @@ files:
 - db/migrate/20230206080303_create_educode_sales_staff_school_tags.rb
 - db/migrate/20230209102302_create_educode_sales_staff_permissions.rb
 - db/migrate/20230215141612_add_mobile_to_teachers.rb
+- db/migrate/20230220144737_add_clazz_id_to_business.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb