educode_sales 0.7.8 → 0.8.2

data/app/views/educode_sales/assessments/progress.json.jbuilder

@@ -160,206 +160,10 @@ json.data do
 
 end
 
-json.code 0
-json.count 0
+json.code 1
+json.count @assessments.count
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# json.data do
-#
-#
-#     # 目标任务
-#     json.name assessment.staff.user.real_name
-#     json.id assessment.id
-#     json.annual assessment.annual.to_i
-#     json.first_quarter assessment.first_quarter.to_i
-#     json.january assessment.january.to_i
-#     json.february assessment.february.to_i
-#     json.march assessment.march.to_i
-#     json.second_quarter assessment.second_quarter.to_i
-#     json.april assessment.april.to_i
-#     json.may assessment.may.to_i
-#     json.june assessment.june.to_i
-#     json.third_quarter assessment.third_quarter.to_i
-#     json.july assessment.july.to_i
-#     json.august assessment.august.to_i
-#     json.september assessment.september.to_i
-#     json.fourth_quarter assessment.fourth_quarter.to_i
-#     json.october assessment.october.to_i
-#     json.november assessment.november.to_i
-#     json.december assessment.december.to_i
-#     #  实际任务
-#     json.annual_progress assessment.annual_progress.to_i
-#     json.first_quarter_progress assessment.first_quarter_progress.to_i
-#     json.january_progress assessment.january_progress.to_i
-#     json.february_progress assessment.february_progress.to_i
-#     json.march_progress assessment.march_progress.to_i
-#     json.second_quarter_progress assessmentsecond_quarter_progress.to_i
-#     json.april_progress assessment.april_progress.to_i
-#     json.may_progress assessment.may_progress.to_i
-#     json.june_progress assessment.june_progress.to_i
-#     json.third_quarter_progress assessment.third_quarter_progress.to_i
-#     json.july_progress assessment.july_progress.to_i
-#     json.august_progress assessment.august_progress.to_i
-#     json.september_progress assessment.september_progress.to_i
-#     json.fourth_quarter_progress assessment.fourth_quarter_progress.to_i
-#     json.october_progress assessment.october_progress.to_i
-#     json.november_progress assessment.november_progress.to_i
-#     json.december_progress assessment.december_progress.to_i
-#     # 差值 dif
-#     json.annual_dif assessment.annual.to_i - assessment.annual_progress.to_i
-#     json.first_quarter_dif assessment.first_quarter.to_i - assessment.first_quarter_progress.to_i
-#     json.january_dif assessment.january.to_i - assessment.january_progress.to_i
-#     json.february_dif assessment.february.to_i - assessment.february_progress.to_i
-#     json.march_dif assessment.march.to_i - assessment.may_progress.to_i
-#     json.second_quarter_dif assessment.second_quarter.to_i - assessmentsecond_quarter_progress.to_i
-#     json.april_dif assessment.april.to_i - assessment.april_progress.to_i
-#     json.may_dif assessment.may.to_i - assessment.may_progress.to_i
-#     json.june_dif assessment.june.to_i - assessment.june_progress.to_i
-#     json.third_quarter_dif assessment.third_quarter.to_i - assessment.third_quarter_progress.to_i
-#     json.july_dif assessment.july.to_i - assessment.july_progress.to_i
-#     json.august_dif assessment.august.to_i - assessment.august_progress.to_i
-#     json.september_dif assessment.september.to_i - assessment.september_progress.to_i
-#     json.fourth_quarter_dif assessment.fourth_quarter.to_i - assessment.fourth_quarter_progress.to_i
-#     json.october_dif assessment.october.to_i - assessment.october_progress.to_i
-#     json.november_dif assessment.november.to_i - assessment.november_progress.to_i
-#     json.december_dif assessment.december.to_i - assessment.december_progress.to_i
-#     # 完成率completion_rate
-#     json.annual_rate   completion_rate(assessment.annual, assessment.annual_progress)
-#     json.first_quarter_rate  completion_rate(assessment.first_quarter, assessment.first_quarter_progress)
-#     json.january_rate  completion_rate(assessment.january,assessment.january_progress)
-#     json.february_rate  completion_rate(assessment.february,assessment.february_progress)
-#     json.march_rate  completion_rate(assessment.march, assessment.march_progress)
-#     json.second_quarter_rate  completion_rate(assessment.second_quarter, assessment.second_quarter_progress)
-#     json.april_rate  completion_rate(assessment.april, assessment.april_progress)
-#     json.may_rate  completion_rate(assessment.may, assessment.may_progress)
-#     json.june_rate  completion_rate(assessment.june, assessment.june_progress)
-#     json.third_quarter_rate   completion_rate(assessment.third_quarter, assessment.third_quarter_progress)
-#     json.july_rate   completion_rate(assessment.july,assessment.july_progress)
-#     json.august_rate  completion_rate(assessment.august,assessment.august_progress)
-#     json.september_rate   completion_rate(assessment.september,assessment.september_progress)
-#     json.fourth_quarter_rate   completion_rate(assessment.fourth_quarter,assessment.fourth_quarter_progress)
-#     json.october_rate   completion_rate(assessment.october,assessment.october_progress)
-#     json.november_rate   completion_rate(assessment.november,assessment.november_progress)
-#     json.december_rate   completion_rate(assessment.december,assessment.december_progress)
-#
-#
-#     #  得分_score
-#     if assessment.assessment == 1
-#       json.assessment '签单金额'
-#       json.annual_score   signed_amount_score(assessment.annual, assessment.annual_progress)
-#       json.first_quarter_score  signed_amount_score(assessment.first_quarter, assessment.first_quarter_progress)
-#       json.january_score      signed_amount_score(assessment.january,assessment.january_progress)
-#       json.february_score    signed_amount_score(assessment.february,assessment.february_progress)
-#       json.march_score     signed_amount_score(assessment.march, assessment.march_progress)
-#       json.second_quarter_score  signed_amount_score(assessment.second_quarter, assessment.second_quarter_progress)
-#       json.april_score   signed_amount_score(assessment.april, assessment.april_progress)
-#       json.may_score     signed_amount_score(assessment.may, assessment.may_progress)
-#       json.june_score     signed_amount_score(assessment.june, assessment.june_progress)
-#       json.third_quarter_score   signed_amount_score(assessment.third_quarter, assessment.third_quarter_progress)
-#       json.july_score      signed_amount_score(assessment.july,assessment.july_progress)
-#       json.august_score     signed_amount_score(assessment.august,assessment.august_progress)
-#       json.september_score    signed_amount_score(assessment.september,assessment.september_progress)
-#       json.fourth_quarter_score  signed_amount_score(assessment.fourth_quarter,assessment.fourth_quarter_progress)
-#       json.october_score     signed_amount_score(assessment.october,assessment.october_progress)
-#       json.november_score   signed_amount_score(assessment.november,assessment.november_progress)
-#       json.december_score   signed_amount_score(assessment.december,assessment.december_progress)
-#     elsif assessment.assessment == 2
-#       json.assessment '回款金额'
-#       json.annual_score collection_amount_score(assessment.annual, assessment.annual_progress)
-#       json.first_quarter_score collection_amount_score(assessment.first_quarter, assessment.first_quarter_progress)
-#       json.january_score collection_amount_score(assessment.january,assessment.january_progress)
-#       json.february_score collection_amount_score(assessment.february,assessment.february_progress)
-#       json.march_score collection_amount_score(assessment.march, assessment.march_progress)
-#       json.second_quarter_score collection_amount_score(assessment.second_quarter, assessment.second_quarter_progress)
-#       json.april_score collection_amount_score(assessment.april, assessment.april_progress)
-#       json.may_score collection_amount_score(assessment.may, assessment.may_progress)
-#       json.june_score collection_amount_score(assessment.june, assessment.june_progress)
-#       json.third_quarter_score collection_amount_score(assessment.third_quarter, assessment.third_quarter_progress)
-#       json.july_score collection_amount_score(assessment.july,assessment.july_progress)
-#       json.august_score collection_amount_score(assessment.august,assessment.august_progress)
-#       json.september_score collection_amount_score(assessment.september,assessment.september_progress)
-#       json.fourth_quarter_score collection_amount_score(assessment.fourth_quarter,assessment.fourth_quarter_progress)
-#       json.october_score collection_amount_score(assessment.october,assessment.october_progress)
-#       json.november_score collection_amount_score(assessment.november,assessment.november_progress)
-#       json.december_score collection_amount_score(assessment.december,assessment.december_progress)
-#     elsif assessment.assessment == 3
-#       json.assessment '拜访量'
-#       json.annual_score  visits_score(assessment.annual_progress)
-#       json.first_quarter_score  visits_score(assessment.first_quarter_progress)
-#       json.january_score  visits_score(assessment.january_progress)
-#       json.february_score  visits_score(assessment.february_progress)
-#       json.march_score  visits_score(assessment.march_progress)
-#       json.second_quarter_score  visits_score(assessment.second_quarter_progress)
-#       json.april_score  visits_score(assessment.april_progress)
-#       json.may_score  visits_score(assessment.may_progress)
-#       json.june_score  visits_score(assessment.june_progress)
-#       json.third_quarter_score  visits_score(assessment.third_quarter_progress)
-#       json.july_score  visits_score(assessment.july_progress)
-#       json.august_score  visits_score(assessment.august_progress)
-#       json.september_score  visits_score(assessment.september_progress)
-#       json.fourth_quarter_score  visits_score(assessment.fourth_quarter_progress)
-#       json.october_score  visits_score(assessment.october_progress)
-#       json.november_score  visits_score(assessment.november_progress)
-#       json.december_score  visits_score(assessment.december_progress)
-#     else
-#       json.assessment '新增商机数'
-#       json.annual_score add_businesses_score(assessment.staff_id,'01-01','12-31')
-#       json.first_quarter_score add_businesses_score(assessment.staff_id,'01-01','03-31')
-#       json.january_score add_businesses_score(assessment.staff_id,'01-01','01-31')
-#       # assessment_year如果时闰年或则平年时的判断----02-28 02-29
-#       json.february_score add_businesses_score(assessment.staff_id,'02-01','02-28')
-#       json.march_score add_businesses_score(assessment.staff_id,'03-01','03-31')
-#       json.second_quarter_score add_businesses_score(assessment.staff_id,'04-01','06-30')
-#       json.april_score add_businesses_score(assessment.staff_id,'04-01','04-30')
-#       json.may_score add_businesses_score(assessment.staff_id,'05-01','05-31')
-#       json.june_score add_businesses_score(assessment.staff_id,'06-01','06-30')
-#       json.third_quarter_score add_businesses_score(assessment.staff_id,'07-01','09-30')
-#       json.july_score add_businesses_score(assessment.staff_id,'07-01','07-31')
-#       json.august_score add_businesses_score(assessment.staff_id,'08-01','08-31')
-#       json.september_score add_businesses_score(assessment.staff_id,'09-01','09-30')
-#       json.fourth_quarter_score add_businesses_score(assessment.staff_id,'10-01','12-31')
-#       json.october_score add_businesses_score(assessment.staff_id,'10-01','10-31')
-#       json.november_score add_businesses_score(assessment.staff_id,'11-01','11-30')
-#       json.december_score add_businesses_score(assessment.staff_id,'12-01','12-31')
-#     end
-#
-# end
-#
-# json.code 0
-# json.count 0
-#
-#
 #
 #
 #

data/app/views/educode_sales/businesses/following_businesses.jbuilder

@@ -0,0 +1,44 @@
+follow_up_ids = EducodeSales::AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+follow_count = 0
+json.data do
+  json.array! @businesses do |d|
+    json.id d.id
+    json.name d.name
+    json.department d.department.name
+    json.school d.department.school.name
+    json.school_id d.department.school.id
+    follow_ups_count = d.follow_ups.where(deleted_at: nil).size
+    json.follow_ups_count follow_ups_count
+    follow_count += follow_ups_count
+    json.follow_up_id d.last_follow_up_id
+    json.clazz d.last_follow_up&.clazz&.name || ""
+    json.stage d.last_follow_up&.stage&.name
+    json.invitation_at d.last_follow_up&.invitation_at.to_s
+    json.reception_at d.last_follow_up&.reception_at.to_s
+    json.bidded_date d.last_follow_up&.bidded_date.to_s
+    json.signed_date d.last_follow_up&.signed_date.to_s
+    json.service_end_time d.last_follow_up&.service_start_time.to_s + "-" + d.last_follow_up&.service_end_time.to_s
+    json.year d.last_follow_up&.year.to_s
+    json.total_amount d.last_follow_up&.total_amount
+    json.actual_amount d.last_follow_up&.actual_amount
+    json.return_money d.return_money
+    json.wait_return_money d.wait_return_money.to_f.round(2)
+    json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '实际回款').present? ? (d.last_follow_up.money_plans.where(clazz: '实际回款').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
+    json.place d.last_follow_up&.place&.name
+    json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
+    json.source d.source
+    json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
+    json.current_staff_id @current_admin.id
+    json.staff_id d.staff_id
+    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
+    json.self_flag (d.staff_id == @current_admin.id) || (d.last_follow_up_id.in? follow_up_ids)
+    json.followed  d.users.where(user_id:@current_admin.user.id).first ? 1 : 0
+    end
+end
+
+json.totalRow do
+  json.follow_ups_count follow_count.to_i.to_s
+end
+json.code 0
+json.count @businesses.size
+json.msg 'succcess'