educode_sales 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbb707c74c7909b2a42a4cc3eaf395677a436c8a210db16ba31cfb5abb0c9cdd
-  data.tar.gz: 7c08a37d777b84396fc415076c6fa768eb0bd9dc56d9e6307451832212141a71
+  metadata.gz: 685592848049f4a9fbcb75c52c46eb4a1ad1ee9cf14725b44a7c79ad0e0714d1
+  data.tar.gz: 8b3ac5946bdb350f6bb92b79f7ab9a5ba91678e24c24ae70b06766709f84fb3d
 SHA512:
-  metadata.gz: d96671e32dfe8e9469c6f93927cf453d86861004d123bbbc01b1118295e7827fd37a1b039ac629a51803d1132341afed7b58fb630919387251253481377d7720
-  data.tar.gz: '0628d9062d5c4b72851dc9cbb0f997169cb395713c3e20263c7b32df369ef323c79370955dffb428b88ff33d9cb297e0ebd3720b1c6bb1f04fdeeb198fbf49ad'
+  metadata.gz: 14cdf1d7faa137de66574701ff7e13e76820bfed31e92960118a1407358c69134c07e51f251532e38de575064d667ab9f2c54d9299a6f59f51a150ffd1b73d83
+  data.tar.gz: 15b1c39abb61f478992198b04698af35cc90e1a6077b697c83d107e1d47c448fbc571436681b630e147aee10fbcb73607e0f7aae5567359e2ceeab4188959f98

data/app/controllers/educode_sales/businesses_controller.rb

@@ -47,8 +47,6 @@ module EducodeSales
           if params[:q].present? && params[:q][:mine].present?
             ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
             ids1 = FollowUp.where(id: ids).pluck(:business_id)
-            # ids2 = Business.where(staff_id: @current_admin.id).pluck(:id)
-            # @businesses = Business.where(id: ids1+ids2)
             @businesses =@businesses.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id)
           end
 
@@ -61,7 +59,12 @@ module EducodeSales
             @businesses = @businesses.joins(:department).where("departments.id in (?)", departments_ids)
           end
           if params[:q].present? && params[:q][:staff_id].present?
-            @businesses = @businesses.where(staff_id: params[:q][:staff_id])
+            part_a_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is null AND staff_id = ?",params[:q][:staff_id]).ids
+            part_b_ids = @businesses.where("educode_sales_businesses.last_follow_up_id is not null").joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.staff_id = ?", params[:q][:staff_id]).pluck(:business_id)
+            business_ids = part_a_ids + part_b_ids
+            @businesses = EducodeSales::Business.where(id:business_ids)
           end
           if params[:q].present? && params[:q][:business_type].present?
             @businesses = @businesses.joins("

data/app/controllers/educode_sales/plans_controller.rb

@@ -78,7 +78,9 @@ module EducodeSales
       else
         @weeks = [week]
       end
-      @businesses = @current_admin.businesses.pluck(:name, :id)
+      ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+      ids1 = FollowUp.where(id: ids).pluck(:business_id)
+      @businesses =Business.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id).pluck(:name, :id)
       render layout: false
     end
 
@@ -92,7 +94,9 @@ module EducodeSales
 
     def new_month
       @business = Business.find_by(id: params[:business_id])
-      @businesses = @current_admin.businesses.pluck(:name, :id)
+      ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+      ids1 = FollowUp.where(id: ids).pluck(:business_id)
+      @businesses =Business.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id).pluck(:name, :id)
       render layout: false
     end
 

data/app/models/educode_sales/teacher.rb

@@ -13,29 +13,22 @@ module EducodeSales
     belongs_to :follow_up, class_name: 'TeacherFollow', optional: true
     validates :user_id, uniqueness: { allow_blank: true, message: '已存在老师列表'}
 
+    def cal_courses_count
+      if self.user_id.present?
+        Course.joins(:course_members).where(course_members: {user_id: self.user_id}).where("is_delete = 0 and role != 4  and excellent = 0 and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct(:course_id).count
+      else
+        0
+      end
+    end
 
-    # def teacher_used_of_department
-    #   if user_id.present?
-    #     user_ids = User.joins(:user_extension).where(user_extensions: {department_id: self.department_id, identity: 0}).pluck(:id)
-    #     course_ids = CourseMember.where(role: "CREATOR", user_id: user_ids).pluck(:course_id)
-    #     if course_ids.present?
-    #       course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
-    #       course_members.present? ? course_members[0]['count'] : 0
-    #     else
-    #       0
-    #     end
-    #   else
-    #     0
-    #   end
-    # end
     def teacher_used_of_department
-        user_ids = User.joins(:user_extension).where(user_extensions: {department_id: self.department_id, identity: 0}).pluck(:id)
-        course_ids = CourseMember.where(role: "CREATOR", user_id: user_ids).pluck(:course_id)
-        course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
-        course_members.present? ? course_members[0]['count'] : 0
+      user_ids = User.joins(:user_extension).where(user_extensions: {department_id: self.department_id, identity: 0}).pluck(:id)
+      course_ids = CourseMember.where(role: "CREATOR", user_id: user_ids).pluck(:course_id)
+      course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
+      course_members.present? ? course_members[0]['count'] : 0
     end
 
-    def students_count
+    def cal_students_count
       if user_id.present?
         course_ids = Course.joins(:course_members).where(course_members: {user_id: user_id}).where("is_delete = 0 and role != 4  and excellent = 0  and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct("course_id").pluck(:course_id)
         CourseMember.where(course_id: course_ids, role: "STUDENT").count

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

@@ -39,12 +39,14 @@
             elem: '#activities_table',
             url: '/missions/activities',
             toolbar: '#activity_toolbar',
+            totalRow:true,
             defaultToolbar: [],
             cols: [
               [
                 {
                   field: 'id',
                   title:'序号',type: 'numbers',
+                    totalRowText:'合计',
                   width: 60
                 },
                 {
@@ -68,11 +70,13 @@
                   field: 'teachers_count',
                   title: '教师数',
                   width: 100,
+                    totalRow:true,
                   templet: '#teachers_count'
                 },
                 {
                   field: 'students_count',
                   title: '学生数',
+                    totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                   width: 100
                 },
                 {

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

@@ -1,14 +1,20 @@
+teachers_count = 0
 json.data do
   json.array! @activities do |d|
     json.id d.id
     json.name d.name
     json.days d.days
     json.teachers_count d.activity_teachers_count
+    teachers_count += d.activity_teachers_count
     json.return_rate d.return_rate
     json.students_count d.students_count || 0
     json.course_rate d.course_rate
     json.start_at d.start_at ? d.start_at.to_s(:date) : ''
   end
 end
+
+json.totalRow do
+  json.teachers_count teachers_count.to_s
+end
 json.code 0
 json.count @activities.total_count

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

@@ -115,6 +115,7 @@
           url: '/missions/businesses',
           where: {q: form.val('search_form')},
           toolbar: '#bussinessBar',
+          totalRow: true,//开启合并行
           defaultToolbar: [],
           cols: [
             [
@@ -122,6 +123,7 @@
                 field: 'id',
                 width: 60,
                 title:'序号',type: 'numbers',
+                  totalRowText: '合计',
               },
               {
                 field: 'name',
@@ -141,8 +143,9 @@
               {
                 field: 'follow_ups_count',
                 title: '跟进',
-                width: 60,
-                templet: '#show_follow'
+                width: 100,
+                templet: '#show_follow',
+                  totalRow: true,
               },
               // {
               //   field: 'teachers_count',
@@ -176,13 +179,15 @@
                 field: 'total_amount',
                 width: 100,
                 title: '总额',
+                  totalRow: true,
                 sort: true
               },
               {
                 field: 'return_money',
                 width: 100,
                 title: '回款',
-                sort: true
+                sort: true,
+                  totalRow: true
               },
               {
                 field: 'place',

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

@@ -1,3 +1,4 @@
+follow_ups_count = 0
 json.data do
   json.array! @businesses do |d|
     json.id d.id
@@ -5,6 +6,7 @@ json.data do
     json.department d.department.name
     json.school d.department.school.name
     json.follow_ups_count d.follow_ups_count
+    follow_ups_count += d.follow_ups_count
     json.follow_up_id d.last_follow_up_id
     # json.teachers_count d.follow_ups.sum(:key_people_count)
     # json.teachers_count EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).present? ? EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).key_people_count : 0
@@ -15,7 +17,7 @@ json.data do
     json.total_amount d.last_follow_up&.total_amount
     json.return_money d.return_money
     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 : ''
+    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.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
@@ -23,6 +25,10 @@ json.data do
     json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
   end
 end
+
+json.totalRow do
+  json.follow_ups_count follow_ups_count.to_s
+end
 json.code 0
 json.count @businesses.total_count
 json.msg 'succcess'

data/app/views/educode_sales/operation_plans/_monthPlan.html.erb

@@ -77,6 +77,7 @@
             elem: '#monthPlanTable',
             url: '/missions/operation_plans?clazz=month',
             toolbar: '#monthPlanToolbar',
+            totalRow:true,
             defaultToolbar: [],
             cols: [
                 [
@@ -84,6 +85,7 @@
                         field: 'id',
                         width: 80,
                         title:'序号',type: 'numbers',
+                        totalRowText:"合计",
                     },
                     {
                         field: 'staff',
@@ -114,12 +116,14 @@
                         field: 'count',
                         width: 100,
                         title: '跟进',
+                        totalRow:true,
                         templet: '#show_follow2'
                     },
                     {
-                        field: 'rate',
+                        field: 'finish_rate',
                         width: 80,
                         title: '完成率',
+                        totalRow:true,
                     },
                     {
                         field: 'updated_at',

data/app/views/educode_sales/operation_plans/_monthly.html.erb

@@ -79,26 +79,35 @@
             url: '/missions/operation_reports?clazz=month',
             toolbar: '#monthlyToolbar',
             defaultToolbar: [],
+            totalRow:true,
             cols: [
                 [
                     {
                         field: 'id',
                         width: 80,
                         title:'序号',type: 'numbers',
+                        totalRowText:"合计",
                     },
                     {
                         field: 'staff',
                         width: 100,
                         title: '姓名'
                     },
+                    {
+                        field: 'month',
+                        width: 100,
+                        title: '月份'
+                    },
                     {
                         field: 'finish_rate',
                         width: 100,
                         title: '完成率',
+                        totalRow:true,
                     },
                     {
                         field: 'client',
                         width: 100,
+                        totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                         title: '运营教师'
                     },
                     {
@@ -130,6 +139,11 @@
                             return '<div class="star3"></div>'
                         }
                     },
+                    {
+                        field: 'created_at',
+                        width: 300,
+                        title: '提交时间',
+                    },
                     {
                         title: '操作',
                         minWidth: 220,

data/app/views/educode_sales/operation_plans/_weekPlan.html.erb

@@ -78,6 +78,7 @@
             elem: '#weekPlanTable1',
             url: '/missions/operation_plans?clazz=week',
             toolbar: '#weekPlanToolbar',
+            totalRow:true,
             defaultToolbar: [],
             cols: [
                 [
@@ -85,6 +86,7 @@
                         field: 'id',
                         width: 80,
                         title:'序号',type: 'numbers',
+                        totalRowText:"合计",
                     },
                     {
                         field: 'staff',
@@ -125,12 +127,14 @@
                         field: 'count',
                         width: 100,
                         title: '跟进',
+                        totalRow:true,
                         templet: '#show_follow1'
                     },
                     {
-                        field: 'rate',
+                        field: 'finish_rate',
                         width: 80,
                         title: '完成率',
+                        totalRow:true,
                     },
                     {
                         field: 'updated_at',

data/app/views/educode_sales/operation_plans/_weekly.html.erb

@@ -79,6 +79,7 @@
             elem: '#weeklyTable',
             url: '/missions/operation_reports?clazz=week',
             toolbar: '#weeklyToolbar',
+            totalRow:true,
             defaultToolbar: [],
             cols: [
                 [
@@ -86,20 +87,28 @@
                         field: 'id',
                         width: 80,
                         title:'序号',type: 'numbers',
+                        totalRowText:"合计",
                     },
                     {
                         field: 'staff',
                         width: 100,
                         title: '姓名'
                     },
+                    {
+                        field: 'weekly',
+                        width: 100,
+                        title: '周次'
+                    },
                     {
                         field: 'finish_rate',
                         width: 100,
                         title: '完成率',
+                        totalRow:true,
                     },
                     {
                         field: 'client',
                         width: 100,
+                        totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                         title: '运营教师'
                     },
                     {
@@ -131,6 +140,11 @@
                             return '<div class="star3"></div>'
                         }
                     },
+                    {
+                        field: 'created_at',
+                        width: 300,
+                        title: '提交时间',
+                    },
                     {
                         title: '操作',
                         minWidth: 220,

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

@@ -1,3 +1,4 @@
+counts = 0
 json.data do
   json.array! @sale_plans do |d|
     json.id d.id
@@ -9,11 +10,18 @@ json.data do
     json.week d.weekly
     json.teacher_id d.teacher_id
     json.content d.content.truncate(30)
-    json.count d.teacher.teacher_follows_count
-    json.rate "#{d.finish_rate}%"
+    count = d.teacher.teacher_follows_count
+    json.count count
+    counts += count
+    json.finish_rate "#{d.finish_rate}%"
     json.updated_at d.updated_at.to_s
   end
 end
 
+json.totalRow do
+  sum = @sale_plans.inject(0) { |score, i| score + i.finish_rate}
+  json.finish_rate ( @sale_plans.size > 0 ? (sum.to_f / @sale_plans.size).round(2).to_s : '0' ) + '%'
+  json.count counts.to_s
+end
 json.code 0
 json.count @sale_plans.total_count

data/app/views/educode_sales/operation_plans/new_monthly.html.erb

@@ -4,7 +4,7 @@
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
   </div>
 </script>
-<form class="layui-form layui-form-pane" action="">
+<form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -35,7 +35,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="newMonthlyTable" lay-filter="newMonthlyToolbar"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="newMonthlyTable" lay-filter="newMonthlyToolbar"></table>
+</div>
 
 <script type="text/html" id="currentMonthly">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>

data/app/views/educode_sales/operation_plans/new_weekly.html.erb

@@ -4,7 +4,7 @@
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
   </div>
 </script>
-<form class="layui-form layui-form-pane" action="">
+<form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -35,7 +35,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyToolbar"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyToolbar"></table>
+</div>
 
 <script type="text/html" id="currentWeekly">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>

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

@@ -11,8 +11,15 @@ json.data do
     json.level2_score d.level2_score || 0
     json.level3_score d.level3_score || 0
     json.updated_at d.updated_at.to_s
+    json.weekly d.weekly
+    json.created_at d.created_at.to_s
+    json.month d.month.strftime("%Y-%m")
   end
 end
 
+json.totalRow do
+  sum = @sale_reports.inject(0) { |score, i| score + i.finish_rate}
+  json.finish_rate ( @sale_reports.size > 0 ? (sum.to_f / @sale_reports.size).round(2).to_s : '0' ) + '%'
+end
 json.code 0
 json.count @sale_reports.total_count

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

@@ -34,6 +34,7 @@
             elem: '#place',
             url: '/missions/places',
             toolbar: '#toolbarDemo',
+            totalRow:true,
             defaultToolbar: [],
             cols: [
               [
@@ -41,6 +42,7 @@
                       field: 'id',
                       width: 80,
                       title:'序号',type: 'numbers',
+                      totalRowText:'合计',
                   },
                   {
                       field: 'name',
@@ -54,16 +56,19 @@
                   {
                       field: 'businesses_count',
                       width: 120,
+                      totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                       title: '商机'
                   },
                   {
                       field: 'amount',
                       width: 120,
+                      totalRow:true,
                       title: '中标'
                   },
                   {
                       field: 'return_mount',
                       width: 120,
+                      totalRow:true,
                       title: '回款',
                   },
                   {

data/app/views/educode_sales/plans/_monthPlan.html.erb

@@ -77,12 +77,14 @@
             url: '/missions/plans?clazz=month',
             toolbar: '#monthPlanToolbar',
             defaultToolbar: [],
+            totalRow:true,
             cols: [
                 [
                     {
                 field: 'id',
                 width: 80,
                 title:'序号',type: 'numbers',
+                        totalRowText:"合计",
               },
               {
                 field: 'staff',
@@ -123,6 +125,7 @@
               {
                 field: 'finish_rate',
                 width: 100,
+                  totalRow:true,
                 title: '完成率',
               },
               {

data/app/views/educode_sales/plans/_monthly.html.erb

@@ -79,30 +79,40 @@
       url: '/missions/sale_reports?clazz=month',
       toolbar: '#monthly_Toolbar',
       defaultToolbar: [],
+        totalRow:true,
       cols: [
         [{
             field: 'id',
             width: 60,
             title:'序号',type: 'numbers',
+            totalRowText:"合计",
           },
           {
             field: 'staff',
             width: 100,
             title: '姓名'
           },
+            {
+                field: 'month',
+                width: 100,
+                title: '月份'
+            },
           {
             field: 'finish_rate',
             width: 100,
+              totalRow:true,
             title: '完成率',
           },
           {
             field: 'client',
             width: 100,
+              totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
             title: '覆盖客户'
           },
           {
             field: 'amount',
             width: 100,
+              totalRow:true,
             title: '项目金额'
           },
           {
@@ -134,6 +144,11 @@
               return '<div class="star3"></div>'
             }
           },
+            {
+                field: 'created_at',
+                width: 300,
+                title: '提交时间',
+            },
           {
             title: '操作',
               minWidth: 220,

data/app/views/educode_sales/plans/_weekPlan.html.erb

@@ -76,6 +76,7 @@
           elem: '#weekPlanTable',
           url: '/missions/plans?clazz=week',
           toolbar: '#weekPlanToolbar',
+            totalRow:true,
           defaultToolbar: [],
           cols: [
             [
@@ -83,6 +84,7 @@
                 field: 'id',
                 width: 80,
                 title:'序号',type: 'numbers',
+                  totalRowText: '合计'
               },
               {
                 field: 'staff',
@@ -129,6 +131,7 @@
                 field: 'finish_rate',
                 width: 100,
                 title: '完成率',
+                  totalRow:true,
               },
               {
                 field: 'updated_at',

data/app/views/educode_sales/plans/_weekly.html.erb

@@ -80,31 +80,41 @@
         url: '/missions/sale_reports?clazz=week',
         toolbar: '#weeklyToolbar',
         defaultToolbar: [],
+          totalRow:true,
         cols: [
           [
             {
               field: 'id',
               width: 60,
               title:'序号',type: 'numbers',
+                totalRowText:"合计",
             },
             {
               field: 'staff',
               width: 100,
               title: '姓名'
             },
+            {
+              field: 'weekly',
+              width: 100,
+              title: '周次'
+            },
             {
               field: 'finish_rate',
               width: 100,
               title: '完成率',
+                totalRow:true,
             },
             {
               field: 'client',
               width: 100,
+                totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
               title: '覆盖客户'
             },
             {
               field: 'amount',
               width: 100,
+                totalRow:true,
               title: '项目金额'
             },
             {
@@ -135,7 +145,13 @@
               templet: function (d) {
                 return '<div class="star3"></div>'
               }
+
             },
+              {
+                  field: 'created_at',
+                  width: 300,
+                  title: '提交时间',
+              },
             {
               title: '操作',
                 minWidth: 220,

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

@@ -15,5 +15,9 @@ json.data do
   end
 end
 
+json.totalRow do
+  sum = @sale_plans.inject(0) { |score, i| score + i.finish_rate}
+  json.finish_rate ( @sale_plans.size > 0 ? (sum.to_f / @sale_plans.size).round(2).to_s : '0' ) + '%'
+end
 json.code 0
 json.count @sale_plans.total_count

data/app/views/educode_sales/plans/new_monthly.html.erb

@@ -6,7 +6,7 @@
     <% end %>
   </div>
 </script>
-<form class="layui-form layui-form-pane">
+<form class="layui-form layui-form-pane" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -42,7 +42,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="newmonthlyTable" lay-filter="newmonthlyTable"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="newmonthlyTable" lay-filter="newmonthlyTable"></table>
+</div>
 <script type="text/html" id="show_follow">
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>

data/app/views/educode_sales/plans/new_weekly.html.erb

@@ -4,7 +4,7 @@
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
   </div>
 </script>
-<form class="layui-form layui-form-pane">
+<form class="layui-form layui-form-pane" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -40,7 +40,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyTable"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyTable"></table>
+</div>
 <script type="text/html" id="show_follow">
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>

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

@@ -10,8 +10,15 @@ json.data do
     json.level2_score d.level2_score || 0
     json.level3_score d.level3_score || 0
     json.updated_at d.updated_at.to_s
+    json.weekly d.weekly
+    json.created_at d.created_at.to_s
+    json.month d.month.strftime("%Y-%m")
   end
 end
 
+json.totalRow do
+  sum = @sale_reports.inject(0) { |score, i| score + i.finish_rate}
+  json.finish_rate ( @sale_reports.size > 0 ? (sum.to_f / @sale_reports.size).round(2).to_s : '0' ) + '%'
+end
 json.code 0
 json.count @sale_reports.total_count

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

@@ -26,10 +26,12 @@
       elem: '#table',
       url: '/missions/sales',
       cellMinWidth: 80,
+        totalRow:true,
       cols: [
         [{
             field: 'id',
             title:'序号',type: 'numbers',
+            totalRowText:'合计',
             width: 80
           }, {
             field: 'name',
@@ -42,19 +44,23 @@
             field: 'business_a',
             title: 'A类商机',
             templet: "#business_a",
+            totalRow:true,
             width: 120
           }, {
             field: 'business_b',
             title: 'B类商机',
             templet: "#business_b",
+            totalRow:true,
             width: 120
           }, {
             field: 'goal',
             title: '中标金额',
+            totalRow:true,
             width: 120
           }, {
             field: 'return_money',
             title: '回款',
+            totalRow:true,
             width: 120
           }
         ]

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

@@ -1,17 +1,33 @@
+businesses_a_count = 0
+businesses_b_count = 0
 json.data do
   json.array! @staffs do |d|
+    part_a_ids = EducodeSales::Business.where("educode_sales_businesses.last_follow_up_id is null AND staff_id = ?",d.id).ids
+    part_b_ids = EducodeSales::Business.where("educode_sales_businesses.last_follow_up_id is not null").joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.staff_id = ?", d.id).pluck(:business_id)
+    business_ids = part_a_ids + part_b_ids
+    @businesses = EducodeSales::Business.where(id:business_ids)
     json.id d.id
     json.name d.user.real_name
     json.role d.role&.name
     json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
-    json.business_a 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 = ?", @a_clazz&.id).count
-    json.business_b 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 = ?", @b_clazz&.id).count
-    json.goal 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 != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
-    json.return_money  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 != ?", @x).sum("educode_sales_businesses.return_money").round(2)
+    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).count
+    businesses_a_count += business_a
+    json.business_a business_a
+    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).count
+    businesses_b_count += business_b
+    json.business_b business_b
+    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("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 != ?", @x).sum("educode_sales_businesses.return_money").round(2)
     json.a_clazz_id @a_clazz&.id
     json.b_clazz_id @b_clazz&.id
   end
 end
 
+json.totalRow do
+  json.business_a businesses_a_count.to_s
+  json.business_b businesses_b_count.to_s
+end
 json.code 0
 json.count @staffs.total_count

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

@@ -32,10 +32,12 @@
             elem: '#oper_table',
             url: '/missions/sales/operations',
             defaultToolbar: [],
+            totalRow:true,
             cols: [
                 [{
                     field: 'id',
                     title:'序号',type: 'numbers',
+                    totalRowText:'合计',
                     width: 80
                 }, {
                     field: 'name',
@@ -52,11 +54,13 @@
                     field: 'schools',
                     title: '跟进学校',
                     templet: "#school",
+                    totalRow:true,
                     width: 120
                 }, {
                     field: 'departments',
                     title: '跟进二级学院',
                     templet: "#xschool",
+                    totalRow:true,
                     width: 120
                 },
                 ]

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

@@ -1,3 +1,5 @@
+departments_count = 0
+schools_count = 0
 json.data do
   json.array! @staffs do |d|
     json.id d.id
@@ -5,11 +7,18 @@ json.data do
     json.role d.role&.name
     json.job_type EducodeSales::Common.job_type_name[d.job_type]
     json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
-    json.departments EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(educode_sales_follow_ups.staff_id) AS count")[0]&.send('count') + EducodeSales::Teacher.joins(:follow_up).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("COUNT(educode_sales_teacher_follows.staff_id) AS count")[0]&.send('count') || 0
-    json.schools EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count'] + EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count']
-
+    departments = EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(educode_sales_follow_ups.staff_id) AS count")[0]&.send('count') + EducodeSales::Teacher.joins(:follow_up).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("COUNT(educode_sales_teacher_follows.staff_id) AS count")[0]&.send('count') || 0
+    json.departments departments
+    schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count'] + EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{d.id}").select("COUNT(distinct(departments.school_id)) AS count")[0]['count']
+    json.schools schools
+    departments_count += departments
+    schools_count += schools
   end
 end
 
+json.totalRow do
+  json.departments departments_count.to_s
+  json.schools schools_count.to_s
+end
 json.code 0
 json.count @staffs.total_count

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

@@ -139,6 +139,7 @@
             url: '/missions/teachers',
             where: {q: form.val('search_form')},
             toolbar: '#toolbarDemo',
+            totalRow:true,
             defaultToolbar: [],
             cols: [
               [
@@ -146,6 +147,7 @@
                     field: 'id',
                     width: 120,
                     title:'序号',type: 'numbers',
+                    totalRowText:'合计',
                 },
                 {
                     field: 'name',
@@ -196,6 +198,7 @@
                     field: 'teacher_follows_count',
                     width: 120,
                     title: '跟进情况',
+                    totalRow:true,
                     templet: "#follow"
                 },
                 {
@@ -206,12 +209,14 @@
                 {
                     field: 'students',
                     width: 120,
+                    totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                     title: '学生',
                 },
                 {
                     field: 'courses_count',
                     width: 120,
                     title: '课堂',
+                    totalRow:true,
                     templet: "#class"
                 },
                 {

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

@@ -1,3 +1,5 @@
+teacher_follows_count = 0
+courses_counts = 0
 json.data do
   json.array! @teachers do |d|
     json.id d.id
@@ -13,12 +15,20 @@ json.data do
     json.activities_count d.activity_teachers_count
     json.source EducodeSales::Common.teacher_source_name[d.source_id]
     json.attitude d.follow_up&.attitude&.name
-    json.courses_count d.user_id ? Course.joins(:course_members).where(course_members: {user_id: d.user_id}).where("is_delete = 0 and role != 4  and excellent = 0 and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct(:course_id).count : 0
+    json.courses_count d.courses_count
     json.actives d.actives
     json.students d.students_count
     json.regist_at d.user.present? ? d.user.created_on.to_s(:date) : ''
-    json.teacher_used d.teacher_used_of_department
+    json.teacher_used d.teacher_used
+
+    teacher_follows_count += d.teacher_follows_count
+    courses_counts += d.courses_count
   end
 end
+
+json.totalRow do
+  json.teacher_follows_count teacher_follows_count.to_s
+  json.courses_count courses_counts.to_s
+end
 json.code 0
 json.count @teachers.total_count

data/app/views/layouts/educode_sales/application.html.erb

@@ -52,7 +52,7 @@
           <dl class="layui-nav-child">
             <% if can? :trends, EducodeSales::SaleTrend %>
               <dd>
-                <a href="/missions/sale_trends/trends" class="<%= current?('layui-this', trends_sale_trends_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/2.市场态势.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>市场态势</a>
+                <a href="/missions/sale_trends/trends" class="<%= current?('layui-this', trends_sale_trends_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/2.市场态势.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>销售态势</a>
               </dd>
             <% end %>
             <% if can? :sales, EducodeSales::Staff %>

data/db/migrate/20211022085324_add_teacher_used_to_teachers.rb

@@ -0,0 +1,7 @@
+class AddTeacherUsedToTeachers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_teachers, :teacher_used, :integer, default: 0
+    add_column :educode_sales_teachers, :students_count, :integer, default: 0
+    add_column :educode_sales_teachers, :courses_count, :integer, default: 0
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -351,6 +351,7 @@ files:
 - db/migrate/20211009063423_add_source_businesses.rb
 - db/migrate/20211013060712_create_educode_sales_assign_follow_ups.rb
 - db/migrate/20211018054256_add_extras_to_commons.rb
+- db/migrate/20211022085324_add_teacher_used_to_teachers.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb