educode_sales 0.8.6 → 0.8.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: fa6e3ad4c5385f2be6eaea6affcdcde6284c8bc04986877ca5880c2a26eff5c0
|
|
4
|
+
data.tar.gz: 19ec51101d14bd95976a5c2211f66209fc6ef27f2894f84d9c21c5d1a4fbb5b2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4091a85e044edea498641d586ea567b878af526f524e1ac32c947d02274379ebb3301ea7b9cd4fd02950b39ca7897a5d392079098ec74e96e59553d37e61bddb
|
|
7
|
+
data.tar.gz: 59d6fa56fafcab5ab09d228f65b443ec70658e72d9bfaba56b7df38492ac46e80404dc95198e874d4a89c3d65dbbb86d96e573abb7c91da450ee08843647d9cf
|
|
@@ -110,16 +110,11 @@ module EducodeSales
|
|
|
110
110
|
end
|
|
111
111
|
end
|
|
112
112
|
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
113
|
# 导出数据
|
|
117
114
|
def get_export_data
|
|
118
115
|
p 'get_export_data'
|
|
119
116
|
end
|
|
120
117
|
|
|
121
|
-
|
|
122
|
-
|
|
123
118
|
# 考核完成情况
|
|
124
119
|
def progress
|
|
125
120
|
p 'progress'
|
|
@@ -128,11 +123,25 @@ module EducodeSales
|
|
|
128
123
|
|
|
129
124
|
|
|
130
125
|
def progress_or_get_export_data
|
|
126
|
+
if @current_admin.is_admin?
|
|
127
|
+
@assessments = AssessmentsSetting.all
|
|
128
|
+
else
|
|
129
|
+
level = @current_admin.role.role_areas.find_by(clazz: '绩效考核').level
|
|
130
|
+
case level
|
|
131
|
+
when '自己'
|
|
132
|
+
@assessments = AssessmentsSetting.where(staff_id: @current_admin.id)
|
|
133
|
+
when '区域'
|
|
134
|
+
@staffs = EducodeSales::Staff.joins(:areas).where("educode_sales_commons.id in (?)", @current_admin.areas.pluck(:id)).distinct
|
|
135
|
+
@assessments = EducodeSales::AssessmentsSetting.where(staff_id: @staffs.select(:id))
|
|
136
|
+
else
|
|
137
|
+
@assessments = AssessmentsSetting.all
|
|
138
|
+
end
|
|
139
|
+
end
|
|
131
140
|
# common = Common.find_by(clazz: 'staff_type', name: '销售')
|
|
132
141
|
# @staff_ids = Staff.joins(:user).where(job_type: common.id).pluck(:id)
|
|
133
142
|
@assessment_id = params[:q].present? && params[:q][:assessment_id].present? ? params[:q][:assessment_id]:'1'
|
|
134
143
|
@assessment_year = params[:q].present? && params[:q][:assessment_year].present? ? params[:q][:assessment_year] : Time.now.year
|
|
135
|
-
@assessments
|
|
144
|
+
@assessments =@assessments.where(assessment: @assessment_id)
|
|
136
145
|
.where("assessment_year >= ? and assessment_year <= ?", "#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:00".to_date)
|
|
137
146
|
.order("created_at desc")
|
|
138
147
|
if @assessments.present?
|
|
@@ -4,59 +4,59 @@ json.data do
|
|
|
4
4
|
# 目标任务
|
|
5
5
|
json.name assessment.staff.user.real_name
|
|
6
6
|
json.id assessment.id
|
|
7
|
-
json.annual assessment.annual.to_f
|
|
8
|
-
json.first_quarter assessment.first_quarter.to_f
|
|
9
|
-
json.january assessment.january.to_f
|
|
10
|
-
json.february assessment.february.to_f
|
|
11
|
-
json.march assessment.march.to_f
|
|
12
|
-
json.second_quarter assessment.second_quarter.to_f
|
|
13
|
-
json.april assessment.april.to_f
|
|
14
|
-
json.may assessment.may.to_f
|
|
15
|
-
json.june assessment.june.to_f
|
|
16
|
-
json.third_quarter assessment.third_quarter.to_f
|
|
17
|
-
json.july assessment.july.to_f
|
|
18
|
-
json.august assessment.august.to_f
|
|
19
|
-
json.september assessment.september.to_f
|
|
20
|
-
json.fourth_quarter assessment.fourth_quarter.to_f
|
|
21
|
-
json.october assessment.october.to_f
|
|
22
|
-
json.november assessment.november.to_f
|
|
23
|
-
json.december assessment.december.to_f
|
|
7
|
+
json.annual assessment.annual.to_f.round(2)
|
|
8
|
+
json.first_quarter assessment.first_quarter.to_f.round(2)
|
|
9
|
+
json.january assessment.january.to_f.round(2)
|
|
10
|
+
json.february assessment.february.to_f.round(2)
|
|
11
|
+
json.march assessment.march.to_f.round(2)
|
|
12
|
+
json.second_quarter assessment.second_quarter.to_f.round(2)
|
|
13
|
+
json.april assessment.april.to_f.round(2)
|
|
14
|
+
json.may assessment.may.to_f.round(2)
|
|
15
|
+
json.june assessment.june.to_f.round(2)
|
|
16
|
+
json.third_quarter assessment.third_quarter.to_f.round(2)
|
|
17
|
+
json.july assessment.july.to_f.round(2)
|
|
18
|
+
json.august assessment.august.to_f.round(2)
|
|
19
|
+
json.september assessment.september.to_f.round(2)
|
|
20
|
+
json.fourth_quarter assessment.fourth_quarter.to_f.round(2)
|
|
21
|
+
json.october assessment.october.to_f.round(2)
|
|
22
|
+
json.november assessment.november.to_f.round(2)
|
|
23
|
+
json.december assessment.december.to_f.round(2)
|
|
24
24
|
# 实际任务
|
|
25
|
-
json.annual_progress assessment.annual_progress.to_f
|
|
26
|
-
json.first_quarter_progress assessment.first_quarter_progress.to_f
|
|
27
|
-
json.january_progress assessment.january_progress.to_f
|
|
28
|
-
json.february_progress assessment.february_progress.to_f
|
|
29
|
-
json.march_progress assessment.march_progress.to_f
|
|
30
|
-
json.second_quarter_progress assessment.second_quarter_progress.to_f
|
|
31
|
-
json.april_progress assessment.april_progress.to_f
|
|
32
|
-
json.may_progress assessment.may_progress.to_f
|
|
33
|
-
json.june_progress assessment.june_progress.to_f
|
|
34
|
-
json.third_quarter_progress assessment.third_quarter_progress.to_f
|
|
35
|
-
json.july_progress assessment.july_progress.to_f
|
|
36
|
-
json.august_progress assessment.august_progress.to_f
|
|
37
|
-
json.september_progress assessment.september_progress.to_f
|
|
38
|
-
json.fourth_quarter_progress assessment.fourth_quarter_progress.to_f
|
|
39
|
-
json.october_progress assessment.october_progress.to_f
|
|
40
|
-
json.november_progress assessment.november_progress.to_f
|
|
41
|
-
json.december_progress assessment.december_progress.to_f
|
|
25
|
+
json.annual_progress assessment.annual_progress.to_f.round(2)
|
|
26
|
+
json.first_quarter_progress assessment.first_quarter_progress.to_f.round(2)
|
|
27
|
+
json.january_progress assessment.january_progress.to_f.round(2)
|
|
28
|
+
json.february_progress assessment.february_progress.to_f.round(2)
|
|
29
|
+
json.march_progress assessment.march_progress.to_f.round(2)
|
|
30
|
+
json.second_quarter_progress assessment.second_quarter_progress.to_f.round(2)
|
|
31
|
+
json.april_progress assessment.april_progress.to_f.round(2)
|
|
32
|
+
json.may_progress assessment.may_progress.to_f.round(2)
|
|
33
|
+
json.june_progress assessment.june_progress.to_f.round(2)
|
|
34
|
+
json.third_quarter_progress assessment.third_quarter_progress.to_f.round(2)
|
|
35
|
+
json.july_progress assessment.july_progress.to_f.round(2)
|
|
36
|
+
json.august_progress assessment.august_progress.to_f.round(2)
|
|
37
|
+
json.september_progress assessment.september_progress.to_f.round(2)
|
|
38
|
+
json.fourth_quarter_progress assessment.fourth_quarter_progress.to_f.round(2)
|
|
39
|
+
json.october_progress assessment.october_progress.to_f.round(2)
|
|
40
|
+
json.november_progress assessment.november_progress.to_f.round(2)
|
|
41
|
+
json.december_progress assessment.december_progress.to_f.round(2)
|
|
42
42
|
# 差值 dif
|
|
43
|
-
json.annual_dif assessment.annual.to_f - assessment.annual_progress.to_f
|
|
44
|
-
json.first_quarter_dif assessment.first_quarter.to_f - assessment.first_quarter_progress.to_f
|
|
45
|
-
json.january_dif assessment.january.to_f - assessment.january_progress.to_f
|
|
46
|
-
json.february_dif assessment.february.to_f - assessment.february_progress.to_f
|
|
47
|
-
json.march_dif assessment.march.to_f - assessment.may_progress.to_f
|
|
48
|
-
json.second_quarter_dif assessment.second_quarter.to_f - assessment.second_quarter_progress.to_f
|
|
49
|
-
json.april_dif assessment.april.to_f - assessment.april_progress.to_f
|
|
50
|
-
json.may_dif assessment.may.to_f - assessment.may_progress.to_f
|
|
51
|
-
json.june_dif assessment.june.to_f - assessment.june_progress.to_f
|
|
52
|
-
json.third_quarter_dif assessment.third_quarter.to_f - assessment.third_quarter_progress.to_f
|
|
53
|
-
json.july_dif assessment.july.to_f - assessment.july_progress.to_f
|
|
54
|
-
json.august_dif assessment.august.to_f - assessment.august_progress.to_f
|
|
55
|
-
json.september_dif assessment.september.to_f - assessment.september_progress.to_f
|
|
56
|
-
json.fourth_quarter_dif assessment.fourth_quarter.to_f - assessment.fourth_quarter_progress.to_f
|
|
57
|
-
json.october_dif assessment.october.to_f - assessment.october_progress.to_f
|
|
58
|
-
json.november_dif assessment.november.to_f - assessment.november_progress.to_f
|
|
59
|
-
json.december_dif assessment.december.to_f - assessment.december_progress.to_f
|
|
43
|
+
json.annual_dif (assessment.annual.to_f - assessment.annual_progress.to_f).round(2)
|
|
44
|
+
json.first_quarter_dif (assessment.first_quarter.to_f - assessment.first_quarter_progress.to_f).round(2)
|
|
45
|
+
json.january_dif (assessment.january.to_f - assessment.january_progress.to_f).round(2)
|
|
46
|
+
json.february_dif (assessment.february.to_f - assessment.february_progress.to_f).round(2)
|
|
47
|
+
json.march_dif (assessment.march.to_f - assessment.may_progress.to_f).round(2)
|
|
48
|
+
json.second_quarter_dif (assessment.second_quarter.to_f - assessment.second_quarter_progress.to_f).round(2)
|
|
49
|
+
json.april_dif (assessment.april.to_f - assessment.april_progress.to_f).round(2)
|
|
50
|
+
json.may_dif (assessment.may.to_f - assessment.may_progress.to_f).round(2)
|
|
51
|
+
json.june_dif (assessment.june.to_f - assessment.june_progress.to_f).round(2)
|
|
52
|
+
json.third_quarter_dif (assessment.third_quarter.to_f - assessment.third_quarter_progress.to_f).round(2)
|
|
53
|
+
json.july_dif (assessment.july.to_f - assessment.july_progress.to_f).round(2)
|
|
54
|
+
json.august_dif (assessment.august.to_f - assessment.august_progress.to_f).round(2)
|
|
55
|
+
json.september_dif (assessment.september.to_f - assessment.september_progress.to_f).round(2)
|
|
56
|
+
json.fourth_quarter_dif (assessment.fourth_quarter.to_f - assessment.fourth_quarter_progress.to_f).round(2)
|
|
57
|
+
json.october_dif (assessment.october.to_f - assessment.october_progress.to_f).round(2)
|
|
58
|
+
json.november_dif (assessment.november.to_f - assessment.november_progress.to_f).round(2)
|
|
59
|
+
json.december_dif (assessment.december.to_f - assessment.december_progress.to_f).round(2)
|
|
60
60
|
# 完成率completion_rate
|
|
61
61
|
json.annual_rate completion_rate(assessment.annual, assessment.annual_progress)
|
|
62
62
|
json.first_quarter_rate completion_rate(assessment.first_quarter, assessment.first_quarter_progress)
|
|
@@ -78,7 +78,7 @@
|
|
|
78
78
|
<div class="layui-inline deployment_type layui-hide">
|
|
79
79
|
<label class="layui-form-label required">部署类型</label>
|
|
80
80
|
<div class="layui-input-inline">
|
|
81
|
-
<%= select_tag "o_business_deployment", options_for_select(@deployment_type,
|
|
81
|
+
<%= select_tag "o_business_deployment", options_for_select(@deployment_type, @last_follow_up&.o_business_deployment), class: 'required' %>
|
|
82
82
|
</div>
|
|
83
83
|
</div>
|
|
84
84
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: educode_sales
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.8.
|
|
4
|
+
version: 0.8.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- anke1460
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2022-
|
|
11
|
+
date: 2022-06-01 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|