educode_sales 1.10.9 → 1.10.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d98a4d83213078f656abfeb070db43d2a6a594e8a273a8ace4bad8165dc541
-  data.tar.gz: 52b10fb147e17a25bd4f3d5b155676cbbb76d61cf6f799b2249edc6428b1ca1e
+  metadata.gz: 8b14ccbfcb9a5061855ca86be07cacb97c60b4775dcfa2a5df9e43ffdef76d7a
+  data.tar.gz: 586ddfdcefed79700eb15c20ccba6b73dbe6ecee3fd12f808d614d843959f536
 SHA512:
-  metadata.gz: 9808f3c65fd410beaf59ef94d4be34b7ba5f25c6377975eead142d6943f5c20007c70b6cd297150473c3e569a29142e17edf89671788e77173389711b2124684
-  data.tar.gz: 5b2c468c9b57723d26804fd589637a5f4f877da54be8a88d180b5aec8adca7b69d08bbd28a901b9c6c0cde03e78755e3cc4750a4c700f62f9c02041456d58b73
+  metadata.gz: fd7f2559d5a6ea7a69482dc0d4cae776e338bcaa99a30b0c303248d5f69abccfbeaf051dc3cbfcfa5b608cf718b7cef989b211f6eef52d4f3b98433b267112fb
+  data.tar.gz: 4c04378292d11f37b2e9c29061470fcec8920c4245bdf7b3c77839e309a20f22b7d6c4ae767a2cf4d4bc37b4d693379464edfbda526b562410a5befb3837a340

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

@@ -136,6 +136,36 @@ module EducodeSales
         if business
           money_plan_record.update(business_id: business.id)
           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
       render_success

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/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.9'
+  VERSION = '1.10.10'
 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.10
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-06-17 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.