educode_sales 0.9.83 → 0.9.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e769e1841e12580e3813a004cc14dca465f65b884df4152f78bcc212aa4f2c75
-  data.tar.gz: 04c60143e5bac234b3384359b3edfa651d4daac44145672e2d6cce9a75ea6679
+  metadata.gz: e498fa041334cb4b387425a7a7f7ff49dffffcee5a72e363b61cb9f32167ff06
+  data.tar.gz: 54d79d72be99cab109f9b40fdd4dd789f72f20d115663abd7d99db70f0ee2527
 SHA512:
-  metadata.gz: 0a68e73f50aa323fb5fdb40d17885d04dda68460d2bb899aa2297a984f6497ea66dadaaaaaaeb03d41716d006b19235ff23063d2a0292e13671bce5d8a3732c1
-  data.tar.gz: 28cb221ad77fc7c40a592e045c7f0c381b6938292bbaff792513a01ac1611ba9fd884b0049de218ee9ab48fa783555110e410216184ce7f81d4f6cb2ef9f68fa
+  metadata.gz: 1e29ad8d3c8dd8c0753dc6662e26c332444cbf10842d308977883c47149c676b0b1c06c515bcfc33e10fe0bfccbc1cecb5ab1c7f2534001c0c1d7a11042a5def
+  data.tar.gz: 5077f36f7bb732c196608fd15c696c06b3d0cf5c74e32c24495b67eadc8b5527eacb1a545966aeea4e3401410ed0e1fbe23c2fb60aea58a8b5513fd1fd570ba6

data/app/controllers/educode_sales/contracts_controller.rb

@@ -233,12 +233,14 @@ module EducodeSales
       @business = Business.find(params[:id])
       @last_follow_up = @business.last_follow_up
       @deployment_type = EducodeSales::FollowUp::BUSINESS_DEPLOYMENT
+      @signed_clazz = EducodeSales::FollowUp.signed_clazzs.keys
+      
       signed_department = @last_follow_up.signed_department
       if signed_department
-        gon.department = {value: signed_department.id, name: "#{signed_department&.school&.name}-#{signed_department&.name}"}
+        gon.department = [{value: signed_department.id, name: "#{signed_department&.school&.name}-#{signed_department&.name}"}]
         gon.value = signed_department.id
       else
-        gon.department = {}
+        gon.department = []
         gon.value = ''
       end
      
@@ -454,7 +456,7 @@ module EducodeSales
 
     private
     def follow_up_params
-      params.permit(:o_business_deployment, :plan_signed_date, :bidded_days, :signed_date, :signed_department_id, :service_years, :service_start_time, :service_end_time, :funding_source)
+      params.permit(:o_business_deployment, :plan_signed_date, :bidded_days, :signed_date, :signed_department_id, :service_years, :service_start_time, :service_end_time, :funding_source, :signed_clazz)
     end
 
     def product_up_params

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -391,7 +391,7 @@ module EducodeSales
           staff_id = params[:staff_id] || nil
           @forecast_count_range = params[:forecast_count_range] || "month"
           forecast_default_dates = ("#{Time.now.year}-01-01".to_date.."#{Time.now.year}-#{Time.now.month}-01".to_date).map { |d| d.strftime("%Y-%m") }.uniq
-          sale_names = %w[计划投标额 实际中标额]
+          sale_names = %w[计划投标额 计划投标额累计 实际中标额 实际中标额累计]
           case @forecast_count_range
           when "week"
             # 年初第一天周数是0会导致周数重复计算

data/app/controllers/educode_sales/sales_details_controller.rb

@@ -0,0 +1,6 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class SalesDetailsController < ApplicationController
+  end
+end

data/app/helpers/educode_sales/sale_trends_helper.rb

@@ -1,45 +1,58 @@
 module EducodeSales
   module SaleTrendsHelper
-
+    NAMES = %w[计划投标额 计划投标额累计 实际中标额 实际中标额累计]
     def goal_forecast_quarter(labels, selects, staff_id = nil)
       plan_get = plan_get(staff_id, labels, "quarter")
       actual_get = actual_get(staff_id, labels, "quarter")
-      datasets = selects.map do |select|
-        if select == "计划投标额"
-          {
-            label: select,
-            data: labels.map do |d|
-              quarter = d.split("-").last.to_i
-              year = d.split("-").first.to_i
-              plan_get[[year, quarter]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
-            end,
-            backgroundColor: [
-              'rgba(255, 99, 132, 0.2)',
-            ],
-            borderColor: [
-              'rgba(255,99,132,1)',
-            ],
-            borderWidth: 1
-          }
-        else
-          {
-            label: select,
-            data: labels.map do |d|
-              quarter = d.split("-").last.to_i
-              year = d.split("-").first.to_i
-              actual_get[[year, quarter]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
-            end,
-            backgroundColor: [
-              'rgba(54, 162, 235, 0.2)',
-            ],
-            borderColor: [
-              'rgba(54, 162, 235, 1)',
-            ],
-            borderWidth: 1
-          }
-        end
+      datasets = selects.map.with_index do |select, i|
+        data = if select == NAMES[0]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_get[[year, quarter]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+               elsif select == NAMES[1]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_get[[year, quarter]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == NAMES[2]
+                 labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_get[[year, quarter]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+               elsif select == NAMES[3]
+                 arr = labels.map do |d|
+                   quarter = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_get[[year, quarter]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+        type = if select == NAMES[3] || select == NAMES[1]
+                 'line'
+               else
+                 "bar"
+               end
+        backgroundColor = if select == NAMES[3] || select == NAMES[1]
+                            'rgba(54, 162, 235, 0.2)'
+                          else
+                            SaleTrend::COLORS[i]
+                          end
+        {
+          type: type,
+          label: select,
+          data: data,
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
       end
-
       {
         labels: labels,
         datasets: datasets
@@ -50,42 +63,58 @@ module EducodeSales
 
       plan_get = plan_get(staff_id, labels, "week")
       actual_get = actual_get(staff_id, labels, "week")
-      datasets = selects.map do |select|
-        if select == "计划投标额"
-          {
-            label: select,
-            data: labels.map do |d|
-              week = d.split("-").last
-              year = d.split("-").first
-              yearweek = "#{year}#{week}".to_i
-              plan_get[yearweek].to_f
-            end,
-            backgroundColor: [
-              'rgba(255, 99, 132, 0.2)',
-            ],
-            borderColor: [
-              'rgba(255,99,132,1)',
-            ],
-            borderWidth: 1
-          }
-        else
-          {
-            label: select,
-            data: labels.map do |d|
-              week = d.split("-").last
-              year = d.split("-").first
-              yearweek = "#{year}#{week}".to_i
-              actual_get[yearweek].to_f
-            end,
-            backgroundColor: [
-              'rgba(54, 162, 235, 0.2)',
-            ],
-            borderColor: [
-              'rgba(54, 162, 235, 1)',
-            ],
-            borderWidth: 1
-          }
-        end
+      datasets = selects.map.with_index do |select, i|
+        data = if select == NAMES[0]
+                 labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   plan_get[yearweek].to_f
+                 end
+               elsif select == NAMES[1]
+                 arr = labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   plan_get[yearweek].to_f
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == NAMES[2]
+                 labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   actual_get[yearweek].to_f
+                 end
+               elsif select == NAMES[3]
+                 arr = labels.map do |d|
+                   week = d.split("-").last
+                   year = d.split("-").first
+                   yearweek = "#{year}#{week}".to_i
+                   actual_get[yearweek].to_f
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+        type = if select == NAMES[0] || select == NAMES[2]
+                 'bar'
+               else
+                 "line"
+               end
+        backgroundColor = if select == NAMES[0] || select == NAMES[2]
+                            SaleTrend::COLORS[i]
+                          else
+                            'rgba(54, 162, 235, 0.2)'
+                          end
+        {
+          type: type,
+          label: select,
+          data: data,
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
       end
 
       {
@@ -97,40 +126,55 @@ module EducodeSales
     def goal_forecast_month(labels, selects, staff_id = nil)
       plan_get = plan_get(staff_id, labels, "month")
       actual_get = actual_get(staff_id, labels, "month")
-      datasets = selects.map do |select|
-        if select == "计划投标额"
-          {
-            label: select,
-            data: labels.map do |d|
-              month = d.split("-").last.to_i
-              year = d.split("-").first.to_i
-              plan_get[[year, month]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
-            end,
-            backgroundColor: [
-              'rgba(255, 99, 132, 0.2)',
-            ],
-            borderColor: [
-              'rgba(255,99,132,1)',
-            ],
-            borderWidth: 1
-          }
-        else
-          {
-            label: select,
-            data: labels.map do |d|
-              month = d.split("-").last.to_i
-              year = d.split("-").first.to_i
-              actual_get[[year, month]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
-            end,
-            backgroundColor: [
-              'rgba(54, 162, 235, 0.2)',
-            ],
-            borderColor: [
-              'rgba(54, 162, 235, 1)',
-            ],
-            borderWidth: 1
-          }
-        end
+      datasets = selects.map.with_index do |select, i|
+        data = if select == NAMES[0]
+                 labels.map do |d|
+                   month = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_get[[year, month]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+               elsif select == NAMES[1]
+                 arr = labels.map do |d|
+                   month = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   plan_get[[year, month]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == NAMES[2]
+                 labels.map do |d|
+                   month = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_get[[year, month]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+               elsif select == NAMES[3]
+                 arr = labels.map do |d|
+                   month = d.split("-").last.to_i
+                   year = d.split("-").first.to_i
+                   actual_get[[year, month]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+                 end
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
+
+        type = if select == NAMES[3] || select == NAMES[1]
+                 'line'
+               else
+                 "bar"
+               end
+        backgroundColor = if select == NAMES[3] || select == NAMES[1]
+                            'rgba(54, 162, 235, 0.2)'
+                          else
+                            SaleTrend::COLORS[i]
+                          end
+        {
+          type: type,
+          label: select,
+          data: data,
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
       end
 
       {
@@ -142,34 +186,40 @@ module EducodeSales
     def goal_forecast_year(labels, selects, staff_id = nil)
       plan_get = plan_get(staff_id, labels, "year")
       actual_get = actual_get(staff_id, labels, "year")
-      datasets = selects.map do |select|
-        if select == "计划投标额"
-          {
-            label: select,
-            data: labels.map { |d| plan_get[d.to_i] || 0 },
-            backgroundColor: [
-              'rgba(255, 99, 132, 0.2)',
-            ],
-            borderColor: [
-              'rgba(255,99,132,1)',
-            ],
-            borderWidth: 1
-          }
-        else
-          {
-            label: select,
-            data: labels.map { |d| actual_get[d.to_i] || 0 },
-            backgroundColor: [
-              'rgba(54, 162, 235, 0.2)',
-            ],
-            borderColor: [
-              'rgba(54, 162, 235, 1)',
-            ],
-            borderWidth: 1
-          }
-        end
-      end
+      datasets = selects.map.with_index do |select, i|
+        data = if select == NAMES[0]
+                 labels.map { |d| plan_get[d.to_i] || 0 }
+               elsif select == NAMES[1]
+                 arr = labels.map { |d| plan_get[d.to_i] || 0 }
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               elsif select == NAMES[2]
+                 labels.map { |d| actual_get[d.to_i] || 0 }
+               elsif select == NAMES[3]
+                 arr = labels.map { |d| actual_get[d.to_i] || 0 }
+                 arr.map.with_index(1) { |num, i| arr.first(i).inject(:+) }
+               end
 
+        type = if select == NAMES[3] || select == NAMES[1]
+                 'line'
+               else
+                 "bar"
+               end
+        backgroundColor = if select == NAMES[3] || select == NAMES[1]
+                            'rgba(54, 162, 235, 0.2)'
+                          else
+                            SaleTrend::COLORS[i]
+                          end
+        {
+          type: type,
+          label: select,
+          data: data,
+          backgroundColor:
+            backgroundColor,
+          borderColor:
+            SaleTrend::COLORS[i],
+          borderWidth: 1
+        }
+      end
       {
         labels: labels,
         datasets: datasets
@@ -180,9 +230,29 @@ module EducodeSales
 
     def plan_get(staff_id, time_range, type)
       # budget_amount 预算额
+      start_time = case type
+                   when "month"
+                     time_range.first + "-01"
+                   when "year"
+                     time_range.first + "-01-01"
+                   when "week"
+                     time_range.first.split("-").first + "-01-01"
+                   when "quarter"
+                     time_range.first.split("-").first + "-01-01"
+                   end
+      end_time = case type
+                 when "month"
+                   time_range.last + "-31"
+                 when "year"
+                   time_range.last + "-12-31"
+                 when "week"
+                   time_range.last.split("-").first + "-12-31"
+                 when "quarter"
+                   time_range.last.split("-").first + "-12-31"
+                 end
       staff_id = staff_id.present? ? Array(staff_id) : nil
       data = Business.joins(:last_follow_up)
-                     .where("educode_sales_follow_ups.invitation_at >= ? and educode_sales_follow_ups.invitation_at <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", time_range.first, time_range.last)
+                     .where("educode_sales_follow_ups.invitation_at >= ? and educode_sales_follow_ups.invitation_at <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", start_time, end_time)
       case type
       when "week"
         data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.invitation_at) as week").group("yearweek(educode_sales_follow_ups.invitation_at)").sum(:budget_amount)
@@ -198,10 +268,30 @@ module EducodeSales
     end
 
     def actual_get(staff_id, time_range, type)
+      start_time = case type
+                   when "month"
+                     time_range.first + "-01"
+                   when "year"
+                     time_range.first + "-01-01"
+                   when "week"
+                     time_range.first.split("-").first + "-01-01"
+                   when "quarter"
+                     time_range.first.split("-").first + "-01-01"
+                   end
+      end_time = case type
+                 when "month"
+                   time_range.last + "-31"
+                 when "year"
+                   time_range.last + "-12-31"
+                 when "week"
+                   time_range.last.split("-").first + "-12-31"
+                 when "quarter"
+                   time_range.last.split("-").first + "-12-31"
+                 end
       # actual_amount 合同额
       staff_id = staff_id.present? ? Array(staff_id) : nil
       data = Business.joins(:last_follow_up)
-                     .where("educode_sales_follow_ups.bidded_date >= ? and educode_sales_follow_ups.bidded_date <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", time_range.first, time_range.last)
+                     .where("educode_sales_follow_ups.bidded_date >= ? and educode_sales_follow_ups.bidded_date <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", start_time, end_time)
       case type
       when "week"
         data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.bidded_date) as week").group("yearweek(educode_sales_follow_ups.bidded_date)").sum(:actual_amount)

data/app/models/educode_sales/follow_up.rb

@@ -10,6 +10,8 @@ module EducodeSales
 
     InfoClazz = ['跟进信息', '建议信息', '评论信息', '审核信息']
 
+    enum signed_clazz: ['直签', '代签', '总集', '渠道']
+
     enum funding_source: ['贷款资金', '财政资金', '自由资金']
 
     include ::Deletable

data/app/models/educode_sales/sale_trend.rb

@@ -2,12 +2,12 @@ module EducodeSales
   class SaleTrend < ApplicationRecord
 
     COLORS = [
-      '#44D7B6', '#4CACFF', '#F7B500', '#FF0000', '#FF7F00', '#FFFF00', '#00FF00', '#00FFFF', '#0000FF',
-      '#8B00FF', 'rgba(255, 99, 132, 1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 
+      '#44D7B6', '#7CFC00', '#4CACFF', "#110FD7", '#F7B500', '#48D1CC', '#FF0000', '#FF7F00', '#FFFF00', '#00FF00', '#00FFFF', '#0000FF',
+      '#8B00FF', 'rgba(255, 99, 132, 1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)',
       'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)', 'rgba(255, 0, 250, 1)', '#A2D9CE', '#D6EAF8', '#E8DAEF', '#FADBD8',
       '#F5B7B1', '#E6B0AA', '#FCF3CF', '#FDEBD0', '#F6DDCC', '#D98880', '#EC7063', '#A569BD', '#85C1E9', '#45B39D', '#F7DC6F',
       '#DC7633', '#839192', '#6C3483', '#B03A2E', '#7B7D7D', '#4D5656', '#28B463', '#0E6655', '#F39C12', '#0E6251', '#1B4F72',
-      '#FAE5D3', '#82E0AA', '#FF00FF', '#663399', '#4B0082', '#7CFC00', '#48D1CC'
+      '#FAE5D3', '#82E0AA', '#FF00FF', '#663399', '#4B0082', '#7CFC00'
     ]
   end
 end

data/app/models/educode_sales/sales_detail.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  class SalesDetail < ApplicationRecord
+    belongs_to :business
+    belongs_to :product_catalog
+    belongs_to :staff
+  end
+end

data/app/services/return_forecast_service.rb

@@ -0,0 +1,230 @@
+module EducodeSales
+  class ReturnForecastService
+    attr_reader :user, :params, :request
+    # ReturnForecastService.new(current_user, request, params).call
+    def initialize(user, request, params)
+      @user = user
+      @request = request
+      @params = params
+    end
+
+    def call
+    end
+
+    def return_forecast_quarter(labels, selects, staff_id = nil)
+      plan_get = plan_get(staff_id, labels, "quarter")
+      actual_get = actual_get(staff_id, labels, "quarter")
+      datasets = selects.map do |select|
+        if select == "计划投标额"
+          {
+            label: select,
+            data: labels.map do |d|
+              quarter = d.split("-").last.to_i
+              year = d.split("-").first.to_i
+              plan_get[[year, quarter]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+            end,
+            backgroundColor: [
+              'rgba(255, 99, 132, 0.2)',
+            ],
+            borderColor: [
+              'rgba(255,99,132,1)',
+            ],
+            borderWidth: 1
+          }
+        else
+          {
+            label: select,
+            data: labels.map do |d|
+              quarter = d.split("-").last.to_i
+              year = d.split("-").first.to_i
+              actual_get[[year, quarter]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+            end,
+            backgroundColor: [
+              'rgba(54, 162, 235, 0.2)',
+            ],
+            borderColor: [
+              'rgba(54, 162, 235, 1)',
+            ],
+            borderWidth: 1
+          }
+        end
+      end
+
+      {
+        labels: labels,
+        datasets: datasets
+      }
+    end
+
+    def return_forecast_week(labels, selects, staff_id = nil)
+
+      plan_get = plan_get(staff_id, labels, "week")
+      actual_get = actual_get(staff_id, labels, "week")
+      datasets = selects.map do |select|
+        if select == "计划投标额"
+          {
+            label: select,
+            data: labels.map do |d|
+              week = d.split("-").last
+              year = d.split("-").first
+              yearweek = "#{year}#{week}".to_i
+              plan_get[yearweek].to_f
+            end,
+            backgroundColor: [
+              'rgba(255, 99, 132, 0.2)',
+            ],
+            borderColor: [
+              'rgba(255,99,132,1)',
+            ],
+            borderWidth: 1
+          }
+        else
+          {
+            label: select,
+            data: labels.map do |d|
+              week = d.split("-").last
+              year = d.split("-").first
+              yearweek = "#{year}#{week}".to_i
+              actual_get[yearweek].to_f
+            end,
+            backgroundColor: [
+              'rgba(54, 162, 235, 0.2)',
+            ],
+            borderColor: [
+              'rgba(54, 162, 235, 1)',
+            ],
+            borderWidth: 1
+          }
+        end
+      end
+
+      {
+        labels: labels,
+        datasets: datasets
+      }
+    end
+
+    def return_forecast_month(labels, selects, staff_id = nil)
+      plan_get = plan_get(staff_id, labels, "month")
+      actual_get = actual_get(staff_id, labels, "month")
+      datasets = selects.map do |select|
+        if select == "计划投标额"
+          {
+            label: select,
+            data: labels.map do |d|
+              month = d.split("-").last.to_i
+              year = d.split("-").first.to_i
+              plan_get[[year, month]]&.pluck(:budget_amount)&.reject(&:blank?)&.sum.to_f
+            end,
+            backgroundColor: [
+              'rgba(255, 99, 132, 0.2)',
+            ],
+            borderColor: [
+              'rgba(255,99,132,1)',
+            ],
+            borderWidth: 1
+          }
+        else
+          {
+            label: select,
+            data: labels.map do |d|
+              month = d.split("-").last.to_i
+              year = d.split("-").first.to_i
+              actual_get[[year, month]]&.pluck(:actual_amount)&.reject(&:blank?)&.sum.to_f
+            end,
+            backgroundColor: [
+              'rgba(54, 162, 235, 0.2)',
+            ],
+            borderColor: [
+              'rgba(54, 162, 235, 1)',
+            ],
+            borderWidth: 1
+          }
+        end
+      end
+
+      {
+        labels: labels,
+        datasets: datasets
+      }
+    end
+
+    def return_forecast_year(labels, selects, staff_id = nil)
+      plan_get = plan_get(staff_id, labels, "year")
+      actual_get = actual_get(staff_id, labels, "year")
+      datasets = selects.map do |select|
+        if select == "计划投标额"
+          {
+            label: select,
+            data: labels.map { |d| plan_get[d.to_i] || 0 },
+            backgroundColor: [
+              'rgba(255, 99, 132, 0.2)',
+            ],
+            borderColor: [
+              'rgba(255,99,132,1)',
+            ],
+            borderWidth: 1
+          }
+        else
+          {
+            label: select,
+            data: labels.map { |d| actual_get[d.to_i] || 0 },
+            backgroundColor: [
+              'rgba(54, 162, 235, 0.2)',
+            ],
+            borderColor: [
+              'rgba(54, 162, 235, 1)',
+            ],
+            borderWidth: 1
+          }
+        end
+      end
+
+      {
+        labels: labels,
+        datasets: datasets
+      }
+    end
+
+    private
+
+    def plan_get(staff_id, time_range, type)
+      # budget_amount 预算额
+      staff_id = staff_id.present? ? Array(staff_id) : nil
+      data = Business.joins(:last_follow_up)
+                     .where("educode_sales_follow_ups.invitation_at >= ? and educode_sales_follow_ups.invitation_at <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", time_range.first, time_range.last)
+      case type
+      when "week"
+        data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.invitation_at) as week").group("yearweek(educode_sales_follow_ups.invitation_at)").sum(:budget_amount)
+      when "quarter"
+        data = data.select("educode_sales_follow_ups.*, quarter(educode_sales_follow_ups.invitation_at) as quarter, year(educode_sales_follow_ups.invitation_at) as year")
+        data.group_by { |d| [d.year, d.quarter] }
+      when "month"
+        data = data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.invitation_at) as year, month(educode_sales_follow_ups.invitation_at) as month")
+        data.group_by { |d| [d.year, d.month] }
+      when "year"
+        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.invitation_at) as year").group("year(educode_sales_follow_ups.invitation_at)").sum(:budget_amount)
+      end
+    end
+
+    def actual_get(staff_id, time_range, type)
+      # actual_amount 合同额
+      staff_id = staff_id.present? ? Array(staff_id) : nil
+      data = Business.joins(:last_follow_up)
+                     .where("educode_sales_follow_ups.bidded_date >= ? and educode_sales_follow_ups.bidded_date <= ? #{staff_id.present? ? "AND educode_sales_follow_ups.staff_id in (#{staff_id.join(",")})" : ""}", time_range.first, time_range.last)
+      case type
+      when "week"
+        data.select("educode_sales_follow_ups.*, yearweek(educode_sales_follow_ups.bidded_date) as week").group("yearweek(educode_sales_follow_ups.bidded_date)").sum(:actual_amount)
+      when "quarter"
+        data = data.select("educode_sales_follow_ups.*, quarter(educode_sales_follow_ups.bidded_date) as quarter, year(educode_sales_follow_ups.bidded_date) as year")
+        data.group_by { |d| [d.year, d.quarter] }
+      when "month"
+        data = data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.bidded_date) as year, month(educode_sales_follow_ups.bidded_date) as month")
+        data.group_by { |d| [d.year, d.month] }
+      when "year"
+        data.select("educode_sales_follow_ups.*, year(educode_sales_follow_ups.bidded_date) as year").group("year(educode_sales_follow_ups.bidded_date)").sum(:actual_amount)
+      end
+    end
+
+  end
+end

data/app/views/educode_sales/contracts/new_follow_up.html.erb

@@ -102,7 +102,7 @@
     <hr>
     <div class="layui-inline">
         <label class="layui-form-label">计划签单时间：</label>
-        <div class="layui-input-inline" style="line-height: 38px;">
+        <div class="layui-input-inline" style="line-height: 38px;width: 100px;">
         <input type="text" class="layui-input date" name="plan_signed_date" autocomplete="off" value="<%= @last_follow_up&.plan_signed_date %>">
         </div>
     </div>
@@ -115,10 +115,16 @@
     </div>
     <div class="layui-inline">
         <label class="layui-form-label" style="width:100px;">实际签单时间：</label>
-        <div class="layui-input-inline" style="line-height: 38px;">
+        <div class="layui-input-inline" style="line-height: 38px;width: 100px;">
         <input type="text" class="layui-input date" name="signed_date" autocomplete="off" value="<%= @last_follow_up&.signed_date %>">
         </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">签约类型：</label>
+      <div class="layui-input-inline" style="line-height: 38px;width:110px;">
+        <%= select_tag "signed_clazz", options_for_select(@signed_clazz, @last_follow_up&.signed_clazz), class: 'required' %>
+      </div>
+    </div>
     <div class="layui-inline">
         <label class="layui-form-label" style="width:100px;">签约单位：</label>
         <div class="layui-input-inline" style="line-height: 38px;">
@@ -611,7 +617,7 @@
             initValue: gon.value, // 渲染初始化默认值
             hasSelectIcon: false,
             placeholder: '请输入头歌平台上单位部门', // 渲染的inputplaceholder值
-            data: [gon.department],
+            data: gon.department,
             remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
             remoteMethod: function (value, cb) { // 远程搜索的回调函数
               if (!value) {

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

@@ -139,7 +139,7 @@
 
         var ctx = document.getElementById('forecast_myChart2');
         var forecast_myChart2 = new Chart(ctx, {
-            type: 'line',
+            type: 'bar',
             data: <%=raw @forecast_count_data.to_json %>,
             options: {
                 elements: {

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

@@ -71,6 +71,8 @@
               <dd><a href="/missions/contracts/product_list" class="<%= current?('layui-this', product_list_contracts_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/4.商机管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>产品目录</a>
               </dd>
             <% end %>
+            <dd><a href="/missions/sales_details" class="<%= current?('layui-this', sales_details_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/4.商机管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售明细</a>
+            </dd>
             <% if can? :read, EducodeSales::MoneyPlan %>
               <dd><a href="/missions/money_plans" class="<%= current?('layui-this', money_plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/money_plans.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>回款计划</a>
               </dd>

data/config/routes.rb

@@ -22,6 +22,9 @@ EducodeSales::Engine.routes.draw do
   resources :sessions do
   end
 
+  resources :sales_details do
+  end
+
   resources :contracts do
     collection do
       get :follow_ups

data/db/migrate/20230510144317_create_educode_sales_sales_details.rb

@@ -0,0 +1,16 @@
+class CreateEducodeSalesSalesDetails < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_sales_details do |t|
+      t.references :business
+      t.references :product_catalog
+      t.references :staff
+      t.float :price
+      t.float :amount
+      t.float :total_price
+      t.integer :custom_clazz
+      t.date :delivery_date
+
+      t.timestamps
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.83'
+  VERSION = '0.9.84'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.83
+  version: 0.9.84
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -173,6 +173,7 @@ files:
 - app/controllers/educode_sales/sale_reports_controller.rb
 - app/controllers/educode_sales/sale_trends_controller.rb
 - app/controllers/educode_sales/sales_controller.rb
+- app/controllers/educode_sales/sales_details_controller.rb
 - app/controllers/educode_sales/sessions_controller.rb
 - app/controllers/educode_sales/staffs_controller.rb
 - app/controllers/educode_sales/teacher_follows_controller.rb
@@ -243,6 +244,7 @@ files:
 - app/models/educode_sales/sale_plan.rb
 - app/models/educode_sales/sale_report.rb
 - app/models/educode_sales/sale_trend.rb
+- app/models/educode_sales/sales_detail.rb
 - app/models/educode_sales/staff.rb
 - app/models/educode_sales/staff_permission.rb
 - app/models/educode_sales/staff_school.rb
@@ -250,6 +252,7 @@ files:
 - app/models/educode_sales/teacher.rb
 - app/models/educode_sales/teacher_assign_follow.rb
 - app/models/educode_sales/teacher_follow.rb
+- app/services/return_forecast_service.rb
 - app/views/educode_sales/activities/_follows.html.erb
 - app/views/educode_sales/activities/_index.html.erb
 - app/views/educode_sales/activities/edit.html.erb
@@ -535,6 +538,7 @@ files:
 - app/views/educode_sales/sales/school.html.erb
 - app/views/educode_sales/sales/trends.html.erb
 - app/views/educode_sales/sales/xschool.html.erb
+- app/views/educode_sales/sales_details/index.html.erb
 - app/views/educode_sales/sessions/login.html.erb
 - app/views/educode_sales/staffs/edit.html.erb
 - app/views/educode_sales/staffs/follow_up_departments.json.jbuilder
@@ -666,6 +670,7 @@ files:
 - db/migrate/20230430134710_create_educode_sales_assign_staffs.rb
 - db/migrate/20230501034307_create_educode_sales_follow_up_trends.rb
 - db/migrate/20230502142912_create_educode_sales_product_catalogs.rb
+- db/migrate/20230510144317_create_educode_sales_sales_details.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb