educode_sales 1.10.9 → 1.10.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d98a4d83213078f656abfeb070db43d2a6a594e8a273a8ace4bad8165dc541
-  data.tar.gz: 52b10fb147e17a25bd4f3d5b155676cbbb76d61cf6f799b2249edc6428b1ca1e
+  metadata.gz: 469c5f6e588ae73f973949a44953233eea096751b775081d061d371b9a7f5bb3
+  data.tar.gz: c0f32866986f7d507a8d391758a51fa8c32a50a47b55060911ff3a4044c82389
 SHA512:
-  metadata.gz: 9808f3c65fd410beaf59ef94d4be34b7ba5f25c6377975eead142d6943f5c20007c70b6cd297150473c3e569a29142e17edf89671788e77173389711b2124684
-  data.tar.gz: 5b2c468c9b57723d26804fd589637a5f4f877da54be8a88d180b5aec8adca7b69d08bbd28a901b9c6c0cde03e78755e3cc4750a4c700f62f9c02041456d58b73
+  metadata.gz: 494c27ee968e40dadbfb934a4f3afbb2ec87753fe345bb885e6f332c0e7863cf28ba52eec37b3a6d13b68494a0d29bb2a096df53268b69116dd6467c57fa74af
+  data.tar.gz: 7b0d19f85b0b399325db34baa74667f75806b407e94098faffdbdb010768aac4c84f595484ec75641790c9ac9d52c24fbad4b87a3471da2b138f7eec9072ee45

data/app/controllers/educode_sales/contracts_controller.rb

@@ -344,6 +344,10 @@ module EducodeSales
           if i == 1 && last_follow_up
             # 验收时间
             last_follow_up.reception_at = v
+          elsif i == 0 && last_follow_up
+            # 合同部署时间
+            last_follow_up.deploy_time = v
+            @business.p_deploy_time = v
           end
         end
        
@@ -523,7 +527,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, :signed_clazz)
+      params.permit(:o_business_deployment, :plan_signed_date, :actual_amount, :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/customers_controller.rb

@@ -221,11 +221,17 @@ module EducodeSales
             s.major_count,
             s.department_id,
             departments.name AS department_name,
-            (SELECT COUNT(user_extensions.id) FROM user_extensions WHERE user_extensions.department_id = s.department_id AND user_extensions.identity = 0) AS teacher_count,
-            (SELECT COUNT(user_extensions.id) FROM user_extensions WHERE user_extensions.department_id = s.department_id AND user_extensions.identity = 1) AS student_count
+            t.teacher_count,
+            t.student_count
           ").joins("
             JOIN schools ON s.id = schools.id
             LEFT JOIN departments ON s.department_id = departments.id
+            LEFT JOIN (
+              SELECT COUNT(IF(user_extensions.identity = 0, user_extensions.id, 0)) AS teacher_count,
+                     COUNT(IF(user_extensions.identity = 1, user_extensions.id, 1)) AS student_count, user_extensions.department_id
+               FROM user_extensions
+               GROUP BY user_extensions.department_id
+            ) AS t ON  t.department_id = s.department_id
           ")
 
           # part_a_ids = CustomerFollow.all.pluck(:school_id)
@@ -271,6 +277,8 @@ module EducodeSales
             @customers = @customers.where(id: school_ids)
           end
 
+          @count = School.joins("LEFT JOIN departments ON schools.id = departments.school_id").count
+
           if params[:page].present?
             @customers = @customers.order(id: :desc).page(params[:page]).per(params[:limit])
           else

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -32,6 +32,10 @@ module EducodeSales
             @money_plan_records = @money_plan_records.where("payer_name like ?", "%#{params[:q][:payer_name]}%")
           end
 
+          if params[:q].present? && params[:q][:school].present?
+            @money_plan_records = @money_plan_records.joins(business: [department: :school]).where("schools.name like ?", "%#{params[:q][:school]}%")
+          end
+
           if params[:q].present? && params[:q][:date_at].present?
             date = params[:q][:date_at].split(" - ")
             @money_plan_records = @money_plan_records.where("date_at BETWEEN ? AND ?", date[0], date[1])
@@ -78,6 +82,10 @@ module EducodeSales
         gon.money_plan_ids << d.money_plan_id.to_s
         gon.money_plan_claim_amount << [d.amount]
       end
+
+      gon.edit_record = can?(:update_record, EducodeSales::MoneyPlan)
+      gon.edit_record_self = can?(:update_record_self, EducodeSales::MoneyPlan)
+      gon.staff_id = @current_admin.id
       render layout: false
     end
 
@@ -127,6 +135,7 @@ module EducodeSales
     def confirm
       money_plan_record = MoneyPlanRecord.find(params[:id])
       money_plan_record.money_plan_claims.where.not(money_plan_id: params[:money_plan_ids]).delete_all
+      businesses = []
       (params[:num].to_i + 1).times do |i|
         claim = money_plan_record.money_plan_claims.find_or_initialize_by(money_plan_id: params[:money_plan_ids][i])
         claim.amount = params["amount[#{i}]"]
@@ -134,10 +143,43 @@ module EducodeSales
         claim.save
         business = claim.money_plan.business
         if business
+          businesses << business
           money_plan_record.update(business_id: business.id)
-          business.update(return_money: claim.money_plan.money_plan_claims.sum(:amount))
+          # business.update(return_money: claim.money_plan.money_plan_claims.sum(:amount))
+
+
+          # # 生成跟进信息
+          # last_follow_up = business.last_follow_up
+          # if last_follow_up.present?
+          #   follow_up = last_follow_up.dup
+      
+          #   follow_up.description = "认领了回款记录"
+           
+          #   follow_up.staff = @current_admin
+      
+          #   last_follow_up.assign_follow_ups.each do |d|
+          #     follow_up.assign_follow_ups.build(staff_id: d.staff_id)
+          #   end
+      
+          #   if follow_up.save!
+          #     last_follow_up.key_person.each do |d|
+          #       key_person = d.dup
+          #       key_person.follow_up_id = follow_up.id
+          #       key_person.save
+          #     end
+          #     last_follow_up.money_plans.each do |d|
+          #       d.follow_up_id = follow_up.id
+          #       d.save
+          #     end
+          #     business.update(last_follow_up_id: follow_up.id)
+          #   end
+          # end
         end
       end
+
+      businesses.uniq.each do |d|
+        d.update(return_money: d.money_plans.joins(:money_plan_claims).sum("educode_sales_money_plan_claims.amount") )
+      end
       render_success
     end
 

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -45,7 +45,7 @@ module EducodeSales
       @staff_manages = {}
       role = EducodeSales::Role.find_by(name: '生态经理')
       EducodeSales::Common.joins(market_areas: :staff).includes(market_areas: :staff).where(clazz: '区域').where("educode_sales_staffs.role_id = #{role.id}").each do |d|
-        @staff_manages[d.name] = d.market_areas.map { |d| d.staff&.user&.real_name }.uniq.compact
+        @staff_manages[d.name] = d.market_areas.map { |d| d.staff&.name }.uniq.compact
       end if role
 
       if @current_admin.is_admin?

data/app/controllers/educode_sales/teachers_controller.rb

@@ -29,13 +29,13 @@ module EducodeSales
           common = Common.find_by(clazz: 'staff_type', name: '运营')
           role = EducodeSales::Role.find_by(name: '生态经理')
           if role
-            @staff_manage = Staff.includes(:user).where(role_id: role.id).map { |d| [d.user.real_name, d.id]}
+            @staff_manage = Staff.where(role_id: role.id).map { |d| [d.name, d.id]}
           else
             @staff_manage = Staff.none
           end
 
-          @follow_upers = Staff.includes(:user).map { |d| [d.user.real_name, d.id]}
-          @staffs = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
+          @follow_upers = Staff.map { |d| [d.name, d.id]}
+          @staffs = Staff.where(job_type: common.id).map { |d| [d.name, d.id]}
           @more = can?(:create, EducodeSales::OperationPlan) || can?(:update, EducodeSales::Teacher) || can?(:destroy, EducodeSales::Teacher)
           gon.menus = []
           if can?(:create, EducodeSales::OperationPlan)
@@ -69,7 +69,7 @@ module EducodeSales
           @sales_manages = {}
           role = EducodeSales::Role.find_by(name: '生态经理')
           EducodeSales::Common.joins(market_areas: :staff).includes(market_areas: :staff).where(clazz: '区域').where("educode_sales_staffs.role_id = #{role.id}").each do |d|
-            @staff_manages[d.name] = d.market_areas.map { |d| d.staff&.user&.real_name }.uniq.compact
+            @staff_manages[d.name] = d.market_areas.map { |d| d.staff&.name }.uniq.compact
           end if role
 
           sales_common = EducodeSales::Common.find_by(clazz: 'staff_type', name: '销售')

data/app/models/educode_sales/money_plan_claim.rb

@@ -10,7 +10,8 @@ module EducodeSales
     private
 
     def update_return_money
-      self.money_plan.business.update(return_money: self.money_plan.money_plan_claims.sum(:amount))
+      amount = self.money_plan.business.money_plans.joins(:money_plan_claims).sum("educode_sales_money_plan_claims.amount")
+      self.money_plan.business.update(return_money: amount)
     end
   end
 end

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

@@ -97,6 +97,13 @@
           <%= select_tag "funding_source", options_for_select([''] + EducodeSales::FollowUp::funding_sources.keys, @last_follow_up&.funding_source), class: 'required' %>
         </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">合同额(万)</label>
+      <div class="layui-input-inline">
+        <input name="actual_amount" type="number" class="layui-input" autocomplete="off" placeholder="本单位的签单金额"
+               value="<%= @last_follow_up&.actual_amount.to_f.round(6) %>">
+      </div>
+    </div>
     <br>
     <h2 style="padding-left:20px;margin-top: 25px;">签单</h2>
     <hr>

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

@@ -48,12 +48,12 @@ json.data do
     json.department d['department_name'] || ''
     json.major_count d['major_count']
     json.department_id d['department_id'] || ''
-    json.teacher_counts d['teacher_count']
-    json.student_counts d['student_count']
+    json.teacher_counts d['teacher_count'] || 0
+    json.student_counts d['student_count'] || 0
   end
 end
 
 json.code 0
 if params[:page].present?
-  json.count @customers.total_count
+  json.count @count
 end

data/app/views/educode_sales/money_plan_records/_index.html.erb

@@ -20,6 +20,12 @@
                     <input type="text" name="date_at" class="layui-input" id="date">
                 </div>
             </div>
+            <div class="layui-inline">
+                <label class="layui-form-label">客户名称</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="school" class="layui-input">
+                </div>
+            </div>
             <div class="layui-inline">
                 <label class="layui-form-label required">匹配状态</label>
                 <div class="layui-input-inline">

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

@@ -27,7 +27,7 @@ json.data do
 
     assign_staff_manages = []
     d.assign_staffs.each do |assign|
-      assign_staff_manages << assign.staff&.user&.real_name
+      assign_staff_manages << assign.staff&.name
     end
     json.staff_manage @staff_manages[d.department&.school&.province].present? ? (@staff_manages[d.department&.school&.province] + assign_staff_manages).uniq.join(",") : assign_staff_manages
     json.sales_manage @sales_manages[d.department&.school&.province]&.join(",")
@@ -40,7 +40,7 @@ json.data do
 
     json.majors d.department&.department_majors&.pluck(:name).present? ? d.department&.department_majors&.pluck(:name).join("，") : ""
 
-    json.follow_person d.follow_up&.staff&.user&.real_name || ''
+    json.follow_person d.follow_up&.staff&.name || ''
     json.created_on d.user.present? ? d.user.created_on.to_s(:date) : ''
     json.last_login_on (d.user.present? && d.user.last_login_on.present?) ? d.user.last_login_on.to_s(:date) : ''
     json.teacher_used d.teacher_used

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.9'
+  VERSION = '1.10.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.9
+  version: 1.10.11
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -759,7 +759,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.