educode_sales 1.10.71 → 1.10.72
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/views/educode_sales/businesses/contract.json.jbuilder +2 -2
- data/app/views/educode_sales/businesses/get_export_data.json.jbuilder +1 -1
- data/app/views/educode_sales/businesses/index.json.jbuilder +2 -2
- data/app/views/educode_sales/contracts/index.json.jbuilder +1 -1
- data/app/views/educode_sales/customers/index.json.jbuilder +1 -1
- data/app/views/educode_sales/follow_ups/index.json.jbuilder +1 -1
- data/app/views/educode_sales/money_plan_records/index.json.jbuilder +1 -1
- data/app/views/educode_sales/money_plans/index.json.jbuilder +1 -1
- data/app/views/educode_sales/plans/business_infos.json.jbuilder +1 -1
- data/app/views/educode_sales/plans/plan_business_infos.json.jbuilder +1 -1
- data/app/views/educode_sales/projects/index.json.jbuilder +1 -1
- data/lib/educode_sales/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 52830e70bdb1217905bf3e98a44f9e7c212080993c00634b8f933bb78f3ff225
|
4
|
+
data.tar.gz: 3d52418c8d060dc71ac301cc014b3fb1ac0ef3c5181618779ebabdf7f7aa9c69
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 22c4529974ac678921cd3fff4496b0670ef0cdae06ed42934201194a628dac4e17ae0de8e5aa58e6a4070920ac3c6db53e3e2acb70d56fdd55c9b10d691239af
|
7
|
+
data.tar.gz: 983ca853eb28a4804338d33acec8df29aef5fc4b392af4c2dc16a6c2313a6c914c1319b97c57a7ab4b0d80fe67502dd461a1a4b0fa26c5798738ef78bb09b7ba
|
@@ -39,11 +39,11 @@ json.data do
|
|
39
39
|
# property << '企业' if school_property.enterprise
|
40
40
|
# end
|
41
41
|
if d.department&.school
|
42
|
-
json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
|
42
|
+
json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
|
43
43
|
else
|
44
44
|
json.property ''
|
45
45
|
end
|
46
|
-
# json.property d.school.school_property.school_tags.where(for_missions: true).pluck(:name).join("、")#property.join("、")
|
46
|
+
# json.property d.school.school_property.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")#property.join("、")
|
47
47
|
json.sale_way d.last_follow_up&.place&.name.present? ? '渠道' : '直销'
|
48
48
|
json.year d.last_follow_up&.year.to_s
|
49
49
|
json.total_amount d.last_follow_up&.total_amount.to_f.round(2)
|
@@ -52,7 +52,7 @@ json.data do
|
|
52
52
|
# end
|
53
53
|
# json.property property.join("、")
|
54
54
|
if d.department&.school
|
55
|
-
json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
|
55
|
+
json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
|
56
56
|
else
|
57
57
|
json.property ''
|
58
58
|
end
|
@@ -47,13 +47,13 @@ json.data do
|
|
47
47
|
# property << '企业' if school_property.enterprise
|
48
48
|
# end
|
49
49
|
if d.department&.school
|
50
|
-
json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
|
50
|
+
json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.uniq.join("、")
|
51
51
|
else
|
52
52
|
json.property ''
|
53
53
|
end
|
54
54
|
json.delete_reason d.delete_reason
|
55
55
|
json.state_id d.state_id
|
56
|
-
# json.property d.school.school_property.school_tags.where(for_missions: true).pluck(:name).join("、")#property.join("、")
|
56
|
+
# json.property d.school.school_property.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")#property.join("、")
|
57
57
|
json.sale_way d.last_follow_up&.place&.name.present? ? '渠道' : '直销'
|
58
58
|
json.year d.last_follow_up&.year.to_s
|
59
59
|
json.total_amount d.last_follow_up&.total_amount.to_f.round(2)
|
@@ -38,7 +38,7 @@ json.data do
|
|
38
38
|
|
39
39
|
|
40
40
|
if d.department&.school
|
41
|
-
json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
|
41
|
+
json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
|
42
42
|
else
|
43
43
|
json.property ''
|
44
44
|
end
|
@@ -15,7 +15,7 @@ json.data do
|
|
15
15
|
json.id d.id
|
16
16
|
json.name d.name
|
17
17
|
json.area d.province
|
18
|
-
json.property d.school_tags.where(for_missions: true).pluck(:name).join("、")
|
18
|
+
json.property d.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
|
19
19
|
json.department d.departments.size
|
20
20
|
json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.school_id = ?", d.id).size
|
21
21
|
json.o_business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id = ?", o).where("educode_sales_businesses.school_id = ?", d.id).size
|
@@ -18,7 +18,7 @@ json.data do
|
|
18
18
|
json.key_people d.key_person.map { |d| d.name }.join("、")# key_people(teacher_ids)
|
19
19
|
|
20
20
|
if d.business.department&.school
|
21
|
-
json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
|
21
|
+
json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
|
22
22
|
else
|
23
23
|
json.property ''
|
24
24
|
end
|
@@ -22,7 +22,7 @@ json.data do
|
|
22
22
|
json.state '待认领'
|
23
23
|
end
|
24
24
|
if d.business&.department&.school
|
25
|
-
json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
|
25
|
+
json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
|
26
26
|
else
|
27
27
|
json.property ''
|
28
28
|
end
|
@@ -35,7 +35,7 @@ json.data do
|
|
35
35
|
json.claim_num d['claim_num']
|
36
36
|
|
37
37
|
if d.business.department&.school
|
38
|
-
json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
|
38
|
+
json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
|
39
39
|
else
|
40
40
|
json.property ''
|
41
41
|
end
|
@@ -18,7 +18,7 @@ json.data do
|
|
18
18
|
json.prepayment_amount d.prepayment_amount || ''
|
19
19
|
json.business_clazz d.business.clazz&.name || ""
|
20
20
|
if d.business&.department&.school
|
21
|
-
json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
|
21
|
+
json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
|
22
22
|
else
|
23
23
|
json.property ''
|
24
24
|
end
|
@@ -37,7 +37,7 @@ json.data do
|
|
37
37
|
|
38
38
|
json.business_clazz d.business.clazz&.name || ""
|
39
39
|
if d.business&.department&.school
|
40
|
-
json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
|
40
|
+
json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
|
41
41
|
else
|
42
42
|
json.property ''
|
43
43
|
end
|
@@ -37,7 +37,7 @@ json.data do
|
|
37
37
|
json.budget_amount d.budget_amount.to_f.round(2) #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0
|
38
38
|
json.area d.department&.school&.province
|
39
39
|
if d.department&.school
|
40
|
-
json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
|
40
|
+
json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
|
41
41
|
else
|
42
42
|
json.property ''
|
43
43
|
end
|