educode_sales 0.5.9 → 0.6.3

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

@@ -16,20 +16,20 @@
       <div class="layui-inline">
         <label class="layui-form-label">负责人</label>
         <div class="layui-input-inline">
-          <%= select_tag "staff_id", options_for_select(@staffs), { include_blank: true } %>
-        </div>
-      </div>
-      <div class="layui-inline">
-        <label class="layui-form-label">最后跟进</label>
-        <div class="layui-input-inline">
-          <input type="text" class="layui-input" id="date" name="date" placeholder=" - ">
+          <%= select_tag "staff_id", options_for_select(@staffs,params[:staff_id]), { include_blank: true } %>
         </div>
       </div>
+<!--      <div class="layui-inline">-->
+<!--        <label class="layui-form-label">最后跟进</label>-->
+<!--        <div class="layui-input-inline">-->
+<!--          <input type="text" class="layui-input" id="date" name="date" placeholder=" - ">-->
+<!--        </div>-->
+<!--      </div>-->
 
       <div class="layui-inline">
         <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
         </button>
-        <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_teachers">搜 索
+        <button type="submit" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="search_teachers">搜 索
         </button>
       </div>
     </div>
@@ -40,7 +40,7 @@
   <div class="layui-btn-container">
     <span class="table-label">客户列表</span>
     <% if can? :create, EducodeSales::Customer %>
-<!--      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">添加客户</button>-->
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">添加客户</button>
     <% end %>
     <% if can? :give, EducodeSales::Customer %>
   <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="give">分配/移交</button>
@@ -59,14 +59,14 @@
 <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_follow">添加跟进记录</a>
   <% end %>
   <% if can? :update, EducodeSales::Customer %>
-<!--<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>-->
+<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <% end %>
 </script>
 <script type="text/html" id="business">
   <a href="/missions/businesses?school={{d.name}}"  class="layui-table-link">{{ d.business }}</a>
 </script>
 <script type="text/html" id="name">
-  <a href="javascript:void(0);" lay-event="name" class="layui-table-link">{{ d.name }}</a>
+  <a href="<%= base_url%>/colleges/{{d.id}}/statistics" class="layui-table-link" target="_blank">{{ d.name }}</a>
 </script>
 <script type="text/html" id="department">
   <a href="javascript:void(0);" lay-event="department" class="layui-table-link">{{ d.department }}</a>
@@ -87,6 +87,13 @@
 
         var laydate = layui.laydate;
 
+        // function hn(){
+        //     $("#search_bt").trigger("click");
+        // }
+        // $(document).ready(function(){
+        //     window.onload=hn;
+        // });
+
         laydate.render({
             elem: '#date',
             range: true
@@ -99,22 +106,21 @@
         table.render({
             elem: '#customers_table',
             url: '/missions/customers',
-            // where: {q: form.val('search_form')},
+            where: {q: form.val('search_teachers')},
             toolbar: '#toolbarDemo',
             // totalRow:true,
             defaultToolbar: ['filter'],
             cols: [
                 [
-                    {type:'checkbox'},
+                    {type: 'checkbox'},
                     {
                         field: 'id',
                         width: 60,
-                        title:'序号',type: 'numbers',
+                        title: '序号', type: 'numbers',
 
                     },
                     {
                         field: 'name',
-                        width: 160,
                         title: '客户名称',
                         templet: "#name"
                     },
@@ -143,7 +149,7 @@
                     },
                     {
                         field: 'last_follow_time',
-                        width: 160,
+                        width: 170,
                         title: '最后跟进时间',
                     },
                     {
@@ -153,7 +159,7 @@
                     },
                     {
                         title: '操作',
-                        minWidth: 170,
+                        width: 300,
                         toolbar: '#currentTableBar',
                         align: "center",
                         fixed: 'right'
@@ -251,11 +257,12 @@
                 name: "",
                 professional_title: "",
                 regist_at: "",
+                staff_id: "",
                 status: "",
                 school: "",
                 assist: "",
                 teacher_source: ""
-            })
+            });
             return false;
         });
         /**
@@ -330,7 +337,7 @@
             var data = obj.data;
             id = data.id
             if (obj.event === 'edit') { // 监听添加操作
-                var content = miniPage.getHrefContent('/missions/customers' + data.id + '/edit');
+                var content = miniPage.getHrefContent('/missions/customers/' + data.id + '/edit');
                 var openWH = miniPage.getOpenWidthHeight();
                 sale_plan_index = layer.open({
                     title: '编辑客户',

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

@@ -1,11 +1,10 @@
 json.data do
   json.array! @customers do |d|
-    department_ids = d.departments.ids
-    business_ids = EducodeSales::Business.where(department_id: department_ids).ids
+    business_ids = EducodeSales::Business.where(school_id:  d.id).ids
     follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
     customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
-    a_last_follow_time = follow_ups.last&.created_at&.to_s(:date)
-    b_last_follow_time = customer_follows.last&.created_at&.to_s(:date)
+    a_last_follow_time = follow_ups.last&.created_at&.to_s
+    b_last_follow_time = customer_follows.last&.created_at&.to_s
     if a_last_follow_time.present? && b_last_follow_time.present?
       json.last_follow_time a_last_follow_time < b_last_follow_time ? b_last_follow_time : a_last_follow_time
     else

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

@@ -1,17 +1,32 @@
-<form class="layui-form " action="">
+<form class="layui-form  layuimini-form" action="">
   <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
-      <label class="layui-form-label required">学校：</label>
-      <div class="layui-input-block">
-        <input type="text" name="name" required lay-verify="required" placeholder="请输入学校" autocomplete="off"
+      <label class="layui-form-label required">客户：</label>
+      <div class="layui-input-block" style="width: 500px;">
+        <input type="text" name="name"  lay-verify="required"  placeholder="请输入客户" autocomplete="off"
                class="layui-input" id="inputFocus">
       </div>
     </div>
     <br>
     <div class="layui-inline">
-      <label class="layui-form-label required">地址：</label>
+      <label class="layui-form-label required">省：</label>
+      <div class="layui-input-block">
+        <%= select_tag "province", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name)), { include_blank: true } %>
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label ">市：</label>
       <div class="layui-input-block">
-        <input type="text" name="address" required lay-verify="required" autocomplete="off"
+        <input type="text" name="city" style="width: 223px;"   autocomplete="off"
+               class="layui-input" placeholder="请输入市" >
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label ">地址：</label>
+      <div class="layui-input-block" style="width: 500px;">
+        <input type="text" name="address"   autocomplete="off"
                class="layui-input" placeholder="请输入地址" >
       </div>
     </div>
@@ -35,7 +50,7 @@
         <input type="checkbox" name="enterprise" lay-skin="primary" value="1" title="企业">
       </div>
     </div>
-    <div class="layui-inline" style="padding-left: 30px">
+    <div class="layui-inline" style="padding-left: 120px">
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交
       </button>
     </div>
@@ -66,23 +81,14 @@
         //监听提交
         form.on('submit(data-reset-btn)', function (data) {
             console.log(data.field);
-            // var area_ids = []
-            // layui.each(transfer.getData('area_list'), function (i, v) {
-            //     area_ids.push(v.value)
-            // })
-            // if (area_ids.length === 0) {
-            //     layer.alert("请选择负责区域");
-            //     return false;
-            // }
-            // data.field['area_ids'] = area_ids;
-            // request.authPost("missions/places", data.field, function (res) {
-            //     if (res.success === false) {
-            //         layer.alert(res.msg)
-            //     } else {
-            //         layer.closeAll(); //关闭所有层
-            //         table.reload('place')
-            //     }
-            // })
+            request.authPost("missions/customers", data.field, function (res) {
+                if (res.success === false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.closeAll(); //关闭所有层
+                    parent.table.reload('customers_table')
+                }
+            })
             return false;
         });
     });

data/app/views/educode_sales/customers/new_department.html.erb

@@ -1,14 +1,16 @@
 <div class="layuimini-main">
   <form class="layui-form  layuimini-form" action="">
+    <div class="layui-form-item" style="padding: 25px">
     <div class="layui-form-item" style="padding: 25px">
       <div class="layui-inline">
         <label class="layui-form-label required">部门名称</label>
-        <div class="layui-input-block">
+        <div class="layui-input-block" style="width: 300px;">
           <input type="text" name="department_name" required lay-verify="required" autocomplete="off" placeholder="请输入"
                  class="layui-input" id="inputFocus">
         </div>
       </div>
-      <div class="layui-inline" style="padding-left: 30px">
+      </div>
+      <div class="layui-form-item" style="padding-left: 130px">
         <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交
         </button>
       </div>
@@ -45,6 +47,7 @@
                 } else {
                     layer.close(parent.new_department_index); //关闭所有层
                     table.reload('sale_plan_follow_table')
+                    parent.table.reload('customers_table')
                 }
             })
             return false;

data/app/views/educode_sales/customers/new_follow_record.html.erb

@@ -1,18 +1,18 @@
 <h1 class="text-center" style="padding: 25px"><%=@school.name %></h1>
-<form class="layui-form " action="">
-    <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">跟进内容</label>
+<form class="layui-form layuimini-form " action="">
+    <div class="layui-form-item layui-form-text" style="padding-right: 30px">
+      <label class="layui-form-label required" >跟进内容</label>
       <div class="layui-input-block">
-        <textarea name="content" placeholder="请输入跟进内容" class="layui-textarea"></textarea>
+        <textarea name="content" placeholder="请输入跟进内容" lay-verify="required" style="height: 200px" class="layui-textarea"></textarea>
       </div>
     </div>
-    <div class="layui-inline">
-      <label class="layui-form-label required">跟进部门</label>
-      <div class="layui-input-inline">
-        <%= select_tag "department_id",options_for_select(@school.departments.pluck(:name, :id)), {"lay-verify": "required", include_blank: true}%>
+  <div class="layui-form-item ">
+      <label class="layui-form-label ">跟进部门</label>
+      <div class="layui-input-inline" style="width: 300px">
+        <%= select_tag "department_id",options_for_select(@school.departments.pluck(:name, :id)), { include_blank: true}%>
       </div>
     </div>
-    <div class="layui-inline" style="padding-left: 50px">
+  <div class="layui-form-item " style="padding-left: 110px">
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_follow_up">提交
       </button>
     </div>

data/app/views/educode_sales/customers/show_follow.html.erb

@@ -54,7 +54,7 @@
                         },
                         {
                             title: '操作',
-                            minWidth: 190,
+                            width: 190,
                             toolbar: '#currentTableBar_follow',
                             align: "center",
                             fixed: 'right'
@@ -251,8 +251,9 @@
                     },
                     {
                         field: 'created_at',
-                        width: 300,
-                        title: '时间'
+                        width: 180,
+                        title: '时间',
+                        sort: true
                     },
                     {
                         field: 'staff',
@@ -266,11 +267,12 @@
                     },
                     {
                         field: 'content',
-                        width: 100,
-                        title: '跟进内容'
+                        title: '跟进内容',
+                        templet:'<div><span title="{{d.content}}">{{d.content}}</span></div>'
                     },
                     {
                         title: '操作',
+                        width: 300,
                         toolbar: '#currentTableBar1234',
                         align: "center"
                     }
@@ -365,6 +367,7 @@
                 layer.confirm('确定删除ID为' + data.id + "的记录", function (index) {
                     request.authDelete("missions/customer_follows/" + data.id, {}, function() {
                         obj.del();
+                        parent.table.reload('customers_table')
                         layer.close(index);
                     })
 

data/app/views/educode_sales/customers/show_follow.json.jbuilder

@@ -3,7 +3,7 @@ json.data do
     json.id d.id
     json.created_at d.created_at.to_s
     json.staff d.staff.user.real_name
-    json.department Department.find(d.department_id)&.name
+    json.department d.department_id.present? ? Department.find(d.department_id)&.name : ''
     json.content d.content
     json.is_latest d.id == @latest.id
   end

data/app/views/educode_sales/customers/show_follow_record.html.erb

@@ -1,16 +1,17 @@
 <h1 class="text-center" style="padding: 25px"><%=@school.name %></h1>
 <form class="layui-form form-value" action="">
   <div class="layui-form-item" style="padding: 25px">
-    <div class="layui-inline">
+    <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">跟进内容：</label>
-      <div class="layui-input-inline">
-        <span><%= @follow_up.content%></span>
+      <div class="layui-input-block" style="padding-right: 20px;">
+        <pre><%= @follow_up.content %></pre>
       </div>
     </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label">跟进部门：</label>
       <div class="layui-input-inline">
-        <span><%= Department.find(@follow_up.department_id)&.name %></span>
+        <span><%=  Department.find(@follow_up.department_id)&.name if @follow_up.department_id.present? %></span>
       </div>
     </div>
   </div>

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

@@ -7,6 +7,7 @@ json.data do
     json.description d.description
     json.advise d.advise
     json.school d.business.department.school.name
+    json.school_id d.business.department.school.id
     json.created_at d.created_at.to_s
     json.business d.business.name
     json.business_id d.business.id

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

@@ -1,3 +1,22 @@
+<div style="margin: 10px 10px 10px 10px">
+  <form class="layui-form layui-form-pane" lay-filter="search_teachers">
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">渠道名称</label>
+        <div class="layui-input-inline">
+          <input type="text" name="name" autocomplete="off" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
+        </button>
+        <button type="submit" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="search_teachers">搜 索
+        </button>
+      </div>
+    </div>
+  </form>
+</div>
+
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">渠道列表</span>
@@ -35,6 +54,51 @@
             request = layui.request,
             miniPage = layui.miniPage;
 
+
+
+        var sort = {}, search = {};
+        table.on('sort(place)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('place', {
+                initSort: obj,
+                where: {
+                    sort: sort,
+                    q: search
+                }
+            });
+        })
+
+        // 监听搜索操作
+        form.on('submit(search_teachers)', function (data) {
+            search = data.field
+            table.reload('place', {
+                page: {
+                    curr: 1
+                },
+                where: {q: search, sort: sort}
+            }, 'data');
+            return false;
+        });
+
+        form.on('submit(reset_business_search)', function (data) {
+            var field = data.field;
+            form.val('search_teachers', {
+                area: "",
+                date: "",
+                attitude: "",
+                name: "",
+                professional_title: "",
+                regist_at: "",
+                staff_id: "",
+                status: "",
+                school: "",
+                assist: "",
+                teacher_source: ""
+            });
+            return false;
+        });
+
         table.render({
             elem: '#place',
             url: '/missions/places',

data/app/views/educode_sales/roles/edit.html.erb

@@ -7,7 +7,7 @@
     <div class="layui-tab-item layui-show">
       <form class="layui-form line" action="">
         <% id = 0 %>
-        <% EducodeSales::Permission.all.group_by{ |d| d.clazz}.each do |k, d| %>
+        <% EducodeSales::Permission.all.order(position: :asc).group_by{ |d| d.clazz}.each do |k, d| %>
          <div class="layui-form-item">
            <label class="layui-form-label"><%= k %></label>
            <div class="layui-input-block">

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -272,6 +272,19 @@
 
   </div>
 </div>
+<br>
+<br>
+<div class="layui-tab layui-tab-card " id="销售额分析" lay-filter="test1">
+  <ul class="layui-tab-title">
+    <li class="layui-this">商机区域分布</li>
+  </ul>
+  <div class="layui-tab-content" style="padding-right: 50px">
+    <div class="layui-tab-item layui-show" style="padding-left: 20px">
+      <canvas id="myChart3" width="960" height="200"></canvas>
+    </div>
+
+  </div>
+</div>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/chart.js@2.9.1/dist/Chart.min.css">
 <script src="https://cdn.jsdelivr.net/npm/chart.js@2.9.1/dist/Chart.min.js"></script>
   <script>
@@ -498,5 +511,12 @@
             data: <%=raw @goal_count_data.to_json %>,
             options: opt
         });
+
+        var ctx = document.getElementById('myChart3');
+        var myChart3 = new Chart(ctx, {
+            type: 'bar',
+            data: <%=raw @business_data.to_json %>,
+            options: opt
+        });
     })
   </script>

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

@@ -1,6 +1,6 @@
 <div class="section">
   <form class="layui-form select_year" action="">
-    <span>销售人员列表</span>
+<!--    <span>销售人员列表</span>-->
     <div class="layui-input-inline" style="float: right">
       <%= select_tag "years", options_for_select(@years,@year), {'lay-filter': 'year' } %>
     </div>
@@ -44,6 +44,16 @@
     <a href="/missions/businesses?clazz_id={{d.o_clazz_id}}&staff_id={{d.id}}">{{d.business_o}}</a>
   </div>
 </script>
+<script type="text/html" id="school_count">
+  <div class="layui-text">
+    <a href="/missions/customers?staff_id={{d.id}}">{{d.school_count}}</a>
+  </div>
+</script>
+<script type="text/html" id="bussinessBar">
+  <span>销售人员列表</span>
+  <div class="layui-btn-container">
+  </div>
+</script>
 <script>
   layui.use('table', function () {
       var form = layui.form,
@@ -58,7 +68,9 @@
     table.render({
       elem: '#table',
       url: '/missions/sales?year=<%= @year %>',
-      cellMinWidth: 80,
+        defaultToolbar: ['filter'],
+        cellMinWidth: 80,
+        toolbar: '#bussinessBar',
         totalRow:true,
       cols: [
         [{
@@ -132,33 +144,39 @@
             {
             field: 'school_count',
             title: '负责学校数',
-            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+                sort:true,
+            totalRow:true,
+                templet: "#school_count",
             width: 120
           },
             {
             field: 'follow_school_count',
             title: '跟进学校数',
+                sort:true,
             totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
             width: 120
           },
             {
             field: 'follow_school_counts',
             title: '跟进学校次数',
+                sort:true,
             totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
-            width: 120
-          },
-            {
-            field: 'follow_school_rate',
-            title: '学校覆盖率',
-            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
-            width: 120
-          },
-            {
-            field: 'follow_department_rate',
-            title: '学院覆盖率',
-            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
-            width: 120
+            width: 130
           },
+          //   {
+          //   field: 'follow_school_rate',
+          //   title: '学校覆盖率',
+          //       sort:true,
+          //   totalRow:true,
+          //   width: 120
+          // },
+          //   {
+          //   field: 'follow_department_rate',
+          //   title: '学院覆盖率',
+          //       sort:true,
+          //   totalRow:true,
+          //   width: 120
+          // },
         ]
       ],
       limit: 20,

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

@@ -4,6 +4,9 @@ businesses_c_count = 0
 businesses_d_count = 0
 businesses_e_count = 0
 businesses_o_count = 0
+school_counts = 0
+follow_school_rates = 0
+follow_department_rates = 0
 area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @staffs do |d|
@@ -33,9 +36,17 @@ json.data do
       business_d = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @d_clazz&.id).count
       business_e = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @e_clazz&.id).count
       business_o = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @o_clazz&.id).count
+      school_count = EducodeSales::CustomerExtension.where(customer_staff_id: d.id).size
       json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
       json.return_money @businesses.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", @x).where.not("educode_sales_money_plans.clazz!= ?", 1).sum(:amount).round(2)
-      json.school_count EducodeSales::CustomerExtension.where(customer_staff_id: d.id).size
+      json.school_count school_count
+      follow_school_count = (EducodeSales::CustomerFollow.where(staff_id: d.id).pluck(:school_id) + EducodeSales::Business.where(id: EducodeSales::FollowUp.where(staff_id: d.id).pluck(:business_id).uniq).pluck(:school_id)).uniq.size
+      json.follow_school_count follow_school_count
+      json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).size + EducodeSales::FollowUp.where(staff_id: d.id).size
+      follow_school_rate = (follow_school_count!=0 ? school_count.to_f * 100 / follow_school_count : 0).round(2)
+      json.follow_school_rate follow_school_rate.to_s + '%'
+      follow_department_rate = (follow_school_count!=0 ? school_count.to_f * 110 / follow_school_count : 0).round(2)
+      json.follow_department_rate follow_department_rate.to_s + '%'
     else
       business_a = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
       business_b = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
@@ -43,9 +54,17 @@ json.data do
       business_d = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @d_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
       business_e = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @e_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
       business_o = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @o_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
+      school_count = EducodeSales::CustomerExtension.where(customer_staff_id: d.id).size
       json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", "#{@year}-01-01", "#{@year}-12-31").sum(:total_amount).round(2)
       json.return_money @businesses.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", @x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").sum(:amount).round(2)
-      json.school_count EducodeSales::CustomerExtension.where(customer_staff_id: d.id).size
+      json.school_count school_count
+      follow_school_count = (EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").pluck(:school_id) + EducodeSales::Business.where(id: EducodeSales::FollowUp.where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").where(staff_id: d.id).pluck(:business_id).uniq).pluck(:school_id)).uniq.size
+      json.follow_school_count follow_school_count
+      json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").size + EducodeSales::FollowUp.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").size
+      follow_school_rate = (follow_school_count!=0 ? school_count.to_f * 100 / follow_school_count : 0).round(2)
+      json.follow_school_rate follow_school_rate.to_s + '%'
+      follow_department_rate = (follow_school_count!=0 ? school_count.to_f * 110 / follow_school_count : 0).round(2)
+      json.follow_department_rate follow_department_rate.to_s + '%'
     end
 
     json.business_a business_a
@@ -67,6 +86,9 @@ json.data do
     businesses_d_count += business_d
     businesses_e_count += business_e
     businesses_o_count += business_o
+    school_counts += school_count
+    follow_school_rates += follow_school_rate
+    follow_department_rates += follow_department_rate
   end
 end
 
@@ -77,6 +99,9 @@ json.totalRow do
   json.business_d businesses_d_count.to_s
   json.business_e businesses_e_count.to_s
   json.business_o businesses_o_count.to_s
+  json.school_count school_counts.to_s
+  json.follow_school_rate (follow_school_rates.to_f / @staffs.size).round(2).to_s + '%'
+  json.follow_department_rate (follow_department_rates.to_f / @staffs.size).round(2).to_s + '%'
 end
 json.code 0
 json.count @staffs.total_count